From acd339fd70d70450d93746745b6f57a2f5230cc2 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 26 Mar 2020 14:17:06 +0000 Subject: [PATCH] chore: revision 189 --- buildSrc/src/main/kotlin/Dependencies.kt | 6 +- .../src/main/java/AbstractArchive.java | 380 +- .../main/java/AbstractByteArrayCopier.java | 847 +- .../src/main/java/AbstractFont.java | 144 +- .../src/main/java/AbstractRasterProvider.java | 52 +- .../src/main/java/AbstractSocket.java | 65 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 180 +- .../src/main/java/AbstractWorldMapData.java | 498 +- .../src/main/java/AbstractWorldMapIcon.java | 423 +- .../src/main/java/AccessFile.java | 42 +- runescape-client/src/main/java/Actor.java | 476 +- runescape-client/src/main/java/Animation.java | 74 +- runescape-client/src/main/java/Archive.java | 260 +- .../src/main/java/ArchiveDisk.java | 123 +- .../src/main/java/ArchiveDiskAction.java | 81 +- .../main/java/ArchiveDiskActionHandler.java | 411 +- .../src/main/java/ArchiveLoader.java | 395 +- .../src/main/java/AttackOption.java | 229 +- .../src/main/java/AudioFilter.java | 116 +- .../src/main/java/BZip2Decompressor.java | 82 +- .../src/main/java/BZip2State.java | 149 +- .../src/main/java/BoundaryObject.java | 421 +- runescape-client/src/main/java/Bounds.java | 158 +- runescape-client/src/main/java/Buddy.java | 54 +- .../src/main/java/BuddyRankComparator.java | 132 +- runescape-client/src/main/java/Buffer.java | 560 +- .../src/main/java/BufferedFile.java | 124 +- .../src/main/java/BufferedNetSocket.java | 44 +- .../src/main/java/BufferedSink.java | 176 +- .../src/main/java/BufferedSource.java | 74 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 52 +- runescape-client/src/main/java/Calendar.java | 89 +- runescape-client/src/main/java/Canvas.java | 66 +- .../src/main/java/ChatChannel.java | 237 +- runescape-client/src/main/java/ClanChat.java | 193 +- runescape-client/src/main/java/ClanMate.java | 101 +- runescape-client/src/main/java/Client.java | 7812 ++++++++--------- .../src/main/java/ClientPacket.java | 1462 +-- .../src/main/java/ClientPreferences.java | 214 +- runescape-client/src/main/java/Clock.java | 95 +- .../src/main/java/CollisionMap.java | 135 +- runescape-client/src/main/java/Coord.java | 286 +- runescape-client/src/main/java/Decimator.java | 355 +- .../src/main/java/DefaultsGroup.java | 40 +- .../src/main/java/DemotingHashTable.java | 38 +- .../java/DesktopPlatformInfoProvider.java | 74 +- .../src/main/java/DevicePcmPlayer.java | 54 +- .../main/java/DevicePcmPlayerProvider.java | 115 +- .../src/main/java/DirectByteArrayCopier.java | 87 +- .../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 | 136 +- runescape-client/src/main/java/Entity.java | 62 +- .../src/main/java/EnumDefinition.java | 110 +- .../src/main/java/Enumerated.java | 6 +- .../main/java/EvictingDualNodeHashTable.java | 38 +- .../src/main/java/FaceNormal.java | 203 +- .../src/main/java/FileSystem.java | 58 +- runescape-client/src/main/java/FillMode.java | 54 - .../src/main/java/FloorDecoration.java | 113 +- .../src/main/java/FloorOverlayDefinition.java | 729 +- .../main/java/FloorUnderlayDefinition.java | 187 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 195 +- runescape-client/src/main/java/Fonts.java | 57 +- runescape-client/src/main/java/Frames.java | 81 +- runescape-client/src/main/java/Friend.java | 46 +- .../src/main/java/FriendLoginUpdate.java | 84 +- .../src/main/java/FriendSystem.java | 221 +- .../src/main/java/FriendsList.java | 55 +- .../src/main/java/GZipDecompressor.java | 35 +- .../src/main/java/GameObject.java | 445 +- runescape-client/src/main/java/GameShell.java | 723 +- .../src/main/java/GrandExchangeEvent.java | 684 +- .../src/main/java/GrandExchangeEvents.java | 707 +- .../src/main/java/GrandExchangeOffer.java | 300 +- .../java/GrandExchangeOfferAgeComparator.java | 1715 ++-- .../GrandExchangeOfferNameComparator.java | 947 +- .../GrandExchangeOfferOwnWorldComparator.java | 268 +- ...dExchangeOfferTotalQuantityComparator.java | 313 +- ...GrandExchangeOfferUnitPriceComparator.java | 235 +- .../GrandExchangeOfferWorldComparator.java | 499 +- .../src/main/java/GraphicsDefaults.java | 320 +- .../src/main/java/GraphicsObject.java | 325 +- runescape-client/src/main/java/HealthBar.java | 54 +- .../src/main/java/HealthBarDefinition.java | 170 +- .../src/main/java/HealthBarUpdate.java | 88 +- .../src/main/java/HitSplatDefinition.java | 366 +- .../src/main/java/HorizontalAlignment.java | 209 +- runescape-client/src/main/java/Huffman.java | 244 +- .../src/main/java/IgnoreList.java | 423 +- runescape-client/src/main/java/Ignored.java | 61 +- .../src/main/java/IndexedSprite.java | 35 +- .../src/main/java/Instrument.java | 84 +- .../src/main/java/IntHashTable.java | 12 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 318 +- .../src/main/java/Interpreter.java | 193 +- .../src/main/java/InvDefinition.java | 103 +- .../src/main/java/IsaacCipher.java | 63 +- .../src/main/java/ItemContainer.java | 162 +- .../src/main/java/ItemDefinition.java | 345 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 22 +- .../src/main/java/IterableNodeDeque.java | 124 +- .../IterableNodeDequeDescendingIterator.java | 48 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 38 +- .../src/main/java/JagexCache.java | 183 +- .../src/main/java/KeyHandler.java | 392 +- .../src/main/java/KitDefinition.java | 182 +- runescape-client/src/main/java/Language.java | 201 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 151 +- .../src/main/java/LoginPacket.java | 89 +- .../src/main/java/LoginScreenAnimation.java | 766 +- runescape-client/src/main/java/LoginType.java | 104 +- .../src/main/java/MenuAction.java | 156 +- runescape-client/src/main/java/Message.java | 233 +- runescape-client/src/main/java/Messages.java | 201 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 805 +- .../src/main/java/MilliClock.java | 246 +- runescape-client/src/main/java/Model.java | 942 +- runescape-client/src/main/java/ModelData.java | 352 +- .../src/main/java/ModelData0.java | 108 +- .../src/main/java/MouseHandler.java | 593 +- .../src/main/java/MouseRecorder.java | 924 +- .../src/main/java/MouseWheel.java | 8 +- .../src/main/java/MouseWheelHandler.java | 22 +- .../src/main/java/MusicPatch.java | 828 +- .../src/main/java/MusicPatchNode.java | 324 +- .../src/main/java/MusicPatchNode2.java | 147 +- .../src/main/java/MusicPatchPcmStream.java | 246 +- .../src/main/java/MusicTrack.java | 26 +- runescape-client/src/main/java/NPC.java | 279 +- .../src/main/java/NPCDefinition.java | 259 +- runescape-client/src/main/java/NanoClock.java | 20 +- runescape-client/src/main/java/NetCache.java | 267 +- .../src/main/java/NetFileRequest.java | 50 +- runescape-client/src/main/java/NetSocket.java | 806 +- runescape-client/src/main/java/Node.java | 16 +- runescape-client/src/main/java/NodeDeque.java | 48 +- .../src/main/java/NodeHashTable.java | 34 +- .../src/main/java/ObjectDefinition.java | 472 +- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 216 +- runescape-client/src/main/java/Occluder.java | 177 +- .../src/main/java/PacketBuffer.java | 469 +- .../src/main/java/PacketBufferNode.java | 135 +- .../src/main/java/PacketWriter.java | 186 +- .../src/main/java/ParamDefinition.java | 44 +- runescape-client/src/main/java/PcmPlayer.java | 366 +- 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 | 136 +- .../src/main/java/PlatformInfo.java | 283 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 555 +- .../src/main/java/PlayerAppearance.java | 621 +- .../src/main/java/PlayerType.java | 76 +- runescape-client/src/main/java/Players.java | 197 +- .../src/main/java/PrivateChatMode.java | 69 +- .../src/main/java/Projectile.java | 236 +- .../src/main/java/RasterProvider.java | 28 +- .../src/main/java/Rasterizer2D.java | 60 +- .../src/main/java/Rasterizer3D.java | 548 +- .../src/main/java/RawPcmStream.java | 1064 ++- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 144 +- .../src/main/java/RouteStrategy.java | 210 +- .../src/main/java/RunException.java | 23 +- runescape-client/src/main/java/Scene.java | 716 +- runescape-client/src/main/java/Script.java | 72 +- .../src/main/java/ScriptEvent.java | 143 +- .../src/main/java/ScriptFrame.java | 460 +- .../src/main/java/SecureRandomCallable.java | 248 +- .../src/main/java/SecureRandomFuture.java | 320 +- .../src/main/java/SequenceDefinition.java | 167 +- .../src/main/java/ServerBuild.java | 62 +- .../src/main/java/ServerPacket.java | 1148 +-- runescape-client/src/main/java/Skeleton.java | 72 +- runescape-client/src/main/java/Skills.java | 65 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 908 +- .../src/main/java/SoundEffect.java | 28 +- .../src/main/java/SoundEnvelope.java | 34 +- .../src/main/java/SoundSystem.java | 87 +- .../main/java/SpotAnimationDefinition.java | 108 +- runescape-client/src/main/java/Sprite.java | 114 +- .../src/main/java/SpriteMask.java | 121 +- runescape-client/src/main/java/Strings.java | 126 +- .../src/main/java/StructDefinition.java | 224 +- .../src/main/java/StudioGame.java | 713 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 142 +- runescape-client/src/main/java/Texture.java | 140 +- .../src/main/java/TextureLoader.java | 30 +- .../src/main/java/TextureProvider.java | 212 +- runescape-client/src/main/java/Tile.java | 334 +- runescape-client/src/main/java/TileItem.java | 24 +- .../src/main/java/TileItemPile.java | 239 +- runescape-client/src/main/java/TileModel.java | 76 +- runescape-client/src/main/java/TilePaint.java | 82 +- runescape-client/src/main/java/Tiles.java | 364 +- runescape-client/src/main/java/Timer.java | 273 +- runescape-client/src/main/java/TriBool.java | 81 +- .../src/main/java/UrlRequest.java | 442 +- .../src/main/java/UrlRequester.java | 91 +- runescape-client/src/main/java/User.java | 38 +- .../src/main/java/UserComparator1.java | 16 +- .../src/main/java/UserComparator10.java | 814 +- .../src/main/java/UserComparator2.java | 22 +- .../src/main/java/UserComparator3.java | 135 +- .../src/main/java/UserComparator4.java | 94 +- .../src/main/java/UserComparator5.java | 443 +- .../src/main/java/UserComparator6.java | 19 +- .../src/main/java/UserComparator7.java | 32 +- .../src/main/java/UserComparator8.java | 175 +- .../src/main/java/UserComparator9.java | 204 +- runescape-client/src/main/java/UserList.java | 474 +- runescape-client/src/main/java/Username.java | 201 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitDefinition.java | 41 +- runescape-client/src/main/java/VarcInt.java | 85 +- runescape-client/src/main/java/Varcs.java | 321 +- .../src/main/java/VarpDefinition.java | 53 +- runescape-client/src/main/java/Varps.java | 56 +- .../src/main/java/VertexNormal.java | 98 +- .../src/main/java/VerticalAlignment.java | 92 +- .../src/main/java/ViewportMouse.java | 400 +- .../src/main/java/VorbisCodebook.java | 83 +- .../src/main/java/VorbisFloor.java | 158 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 26 +- .../src/main/java/VorbisSample.java | 384 +- .../src/main/java/WallDecoration.java | 154 +- runescape-client/src/main/java/Widget.java | 1041 ++- runescape-client/src/main/java/World.java | 269 +- runescape-client/src/main/java/WorldMap.java | 714 +- .../src/main/java/WorldMapArchiveLoader.java | 49 +- .../src/main/java/WorldMapArea.java | 329 +- .../src/main/java/WorldMapAreaData.java | 178 +- .../src/main/java/WorldMapCacheName.java | 372 +- .../src/main/java/WorldMapData_0.java | 163 +- .../src/main/java/WorldMapData_1.java | 475 +- .../src/main/java/WorldMapDecoration.java | 320 +- .../src/main/java/WorldMapDecorationType.java | 976 +- .../src/main/java/WorldMapElement.java | 191 +- .../src/main/java/WorldMapEvent.java | 471 +- .../src/main/java/WorldMapID.java | 500 +- .../src/main/java/WorldMapIcon_0.java | 266 +- .../src/main/java/WorldMapIcon_1.java | 145 +- .../src/main/java/WorldMapLabel.java | 261 +- .../src/main/java/WorldMapLabelSize.java | 367 +- .../src/main/java/WorldMapManager.java | 246 +- .../src/main/java/WorldMapRectangle.java | 333 +- .../src/main/java/WorldMapRegion.java | 962 +- .../src/main/java/WorldMapSection.java | 34 +- .../src/main/java/WorldMapSection0.java | 580 +- .../src/main/java/WorldMapSection1.java | 960 +- .../src/main/java/WorldMapSection2.java | 259 +- .../src/main/java/WorldMapSectionType.java | 215 +- .../src/main/java/WorldMapSprite.java | 121 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 18 +- runescape-client/src/main/java/class1.java | 88 +- runescape-client/src/main/java/class10.java | 35 + runescape-client/src/main/java/class105.java | 114 + .../main/java/{class99.java => class108.java} | 8 +- runescape-client/src/main/java/class11.java | 5 + runescape-client/src/main/java/class12.java | 11 + runescape-client/src/main/java/class13.java | 489 +- runescape-client/src/main/java/class14.java | 162 - runescape-client/src/main/java/class146.java | 7 - runescape-client/src/main/java/class155.java | 7 + runescape-client/src/main/java/class16.java | 38 - runescape-client/src/main/java/class160.java | 129 - runescape-client/src/main/java/class161.java | 5 - runescape-client/src/main/java/class162.java | 37 - runescape-client/src/main/java/class169.java | 185 + runescape-client/src/main/java/class170.java | 5 + runescape-client/src/main/java/class171.java | 7 + runescape-client/src/main/java/class173.java | 51 - runescape-client/src/main/java/class181.java | 5 - runescape-client/src/main/java/class182.java | 42 + runescape-client/src/main/java/class185.java | 139 - runescape-client/src/main/java/class186.java | 11 - runescape-client/src/main/java/class188.java | 41 - runescape-client/src/main/java/class189.java | 19 - runescape-client/src/main/java/class190.java | 5 + runescape-client/src/main/java/class191.java | 122 - runescape-client/src/main/java/class192.java | 190 - runescape-client/src/main/java/class194.java | 85 + runescape-client/src/main/java/class195.java | 42 +- runescape-client/src/main/java/class197.java | 133 +- runescape-client/src/main/java/class198.java | 24 + runescape-client/src/main/java/class2.java | 453 +- runescape-client/src/main/java/class200.java | 67 + runescape-client/src/main/java/class201.java | 248 + runescape-client/src/main/java/class204.java | 85 + runescape-client/src/main/java/class206.java | 65 + runescape-client/src/main/java/class208.java | 486 - runescape-client/src/main/java/class210.java | 35 - runescape-client/src/main/java/class215.java | 181 - runescape-client/src/main/java/class217.java | 74 + runescape-client/src/main/java/class218.java | 70 - runescape-client/src/main/java/class219.java | 57 + runescape-client/src/main/java/class22.java | 569 ++ runescape-client/src/main/java/class222.java | 119 - runescape-client/src/main/java/class223.java | 117 - runescape-client/src/main/java/class224.java | 210 + runescape-client/src/main/java/class225.java | 597 -- runescape-client/src/main/java/class226.java | 22 - runescape-client/src/main/java/class227.java | 48 + runescape-client/src/main/java/class228.java | 91 +- runescape-client/src/main/java/class23.java | 15 + runescape-client/src/main/java/class231.java | 28 + runescape-client/src/main/java/class232.java | 25 + runescape-client/src/main/java/class234.java | 25 + runescape-client/src/main/java/class236.java | 62 + runescape-client/src/main/java/class237.java | 442 + runescape-client/src/main/java/class238.java | 223 - runescape-client/src/main/java/class247.java | 181 + runescape-client/src/main/java/class248.java | 16 - runescape-client/src/main/java/class25.java | 259 + runescape-client/src/main/java/class257.java | 16 + runescape-client/src/main/java/class267.java | 89 - runescape-client/src/main/java/class268.java | 19 - runescape-client/src/main/java/class276.java | 16 + runescape-client/src/main/java/class277.java | 49 + runescape-client/src/main/java/class278.java | 22 + runescape-client/src/main/java/class280.java | 56 + runescape-client/src/main/java/class287.java | 41 - runescape-client/src/main/java/class288.java | 652 -- runescape-client/src/main/java/class289.java | 43 - runescape-client/src/main/java/class290.java | 129 - runescape-client/src/main/java/class296.java | 13 + runescape-client/src/main/java/class297.java | 52 + runescape-client/src/main/java/class298.java | 33 +- runescape-client/src/main/java/class299.java | 191 + runescape-client/src/main/java/class3.java | 290 +- runescape-client/src/main/java/class30.java | 153 - runescape-client/src/main/java/class300.java | 21 + runescape-client/src/main/java/class303.java | 30 + runescape-client/src/main/java/class306.java | 16 + .../java/{class301.java => class310.java} | 6 +- runescape-client/src/main/java/class313.java | 84 - runescape-client/src/main/java/class32.java | 19 - runescape-client/src/main/java/class320.java | 13 - runescape-client/src/main/java/class322.java | 73 + runescape-client/src/main/java/class326.java | 31 - runescape-client/src/main/java/class329.java | 18 + runescape-client/src/main/java/class332.java | 57 + runescape-client/src/main/java/class335.java | 34 + .../java/{class216.java => class336.java} | 12 +- runescape-client/src/main/java/class337.java | 21 - runescape-client/src/main/java/class339.java | 14 - runescape-client/src/main/java/class346.java | 21 + runescape-client/src/main/java/class348.java | 24 + runescape-client/src/main/java/class39.java | 137 + runescape-client/src/main/java/class4.java | 158 +- runescape-client/src/main/java/class40.java | 804 -- runescape-client/src/main/java/class41.java | 300 + runescape-client/src/main/java/class42.java | 303 - runescape-client/src/main/java/class43.java | 69 - runescape-client/src/main/java/class49.java | 763 +- runescape-client/src/main/java/class5.java | 30 + runescape-client/src/main/java/class51.java | 306 +- runescape-client/src/main/java/class52.java | 142 + .../main/java/{class47.java => class56.java} | 12 +- runescape-client/src/main/java/class58.java | 115 + runescape-client/src/main/java/class6.java | 80 + runescape-client/src/main/java/class60.java | 183 +- runescape-client/src/main/java/class65.java | 77 - runescape-client/src/main/java/class69.java | 141 + runescape-client/src/main/java/class7.java | 154 + runescape-client/src/main/java/class74.java | 105 + runescape-client/src/main/java/class8.java | 52 + runescape-client/src/main/java/class80.java | 61 - runescape-client/src/main/java/class81.java | 19 - runescape-client/src/main/java/class83.java | 68 - runescape-client/src/main/java/class89.java | 23 + runescape-client/src/main/java/class9.java | 113 + runescape-client/src/main/java/class90.java | 81 + runescape-client/src/main/java/class92.java | 106 + runescape-client/src/main/java/class96.java | 191 - 392 files changed, 43289 insertions(+), 42917 deletions(-) delete mode 100644 runescape-client/src/main/java/FillMode.java create mode 100644 runescape-client/src/main/java/class10.java create mode 100644 runescape-client/src/main/java/class105.java rename runescape-client/src/main/java/{class99.java => class108.java} (68%) create mode 100644 runescape-client/src/main/java/class11.java create mode 100644 runescape-client/src/main/java/class12.java delete mode 100644 runescape-client/src/main/java/class14.java delete mode 100644 runescape-client/src/main/java/class146.java create mode 100644 runescape-client/src/main/java/class155.java delete mode 100644 runescape-client/src/main/java/class16.java delete mode 100644 runescape-client/src/main/java/class160.java delete mode 100644 runescape-client/src/main/java/class161.java delete mode 100644 runescape-client/src/main/java/class162.java create mode 100644 runescape-client/src/main/java/class169.java create mode 100644 runescape-client/src/main/java/class170.java create mode 100644 runescape-client/src/main/java/class171.java delete mode 100644 runescape-client/src/main/java/class173.java delete mode 100644 runescape-client/src/main/java/class181.java create mode 100644 runescape-client/src/main/java/class182.java delete mode 100644 runescape-client/src/main/java/class185.java delete mode 100644 runescape-client/src/main/java/class186.java delete mode 100644 runescape-client/src/main/java/class188.java delete mode 100644 runescape-client/src/main/java/class189.java create mode 100644 runescape-client/src/main/java/class190.java delete mode 100644 runescape-client/src/main/java/class191.java delete mode 100644 runescape-client/src/main/java/class192.java create mode 100644 runescape-client/src/main/java/class194.java create mode 100644 runescape-client/src/main/java/class198.java create mode 100644 runescape-client/src/main/java/class200.java create mode 100644 runescape-client/src/main/java/class201.java create mode 100644 runescape-client/src/main/java/class204.java create mode 100644 runescape-client/src/main/java/class206.java delete mode 100644 runescape-client/src/main/java/class208.java delete mode 100644 runescape-client/src/main/java/class210.java delete mode 100644 runescape-client/src/main/java/class215.java create mode 100644 runescape-client/src/main/java/class217.java delete mode 100644 runescape-client/src/main/java/class218.java create mode 100644 runescape-client/src/main/java/class219.java create mode 100644 runescape-client/src/main/java/class22.java delete mode 100644 runescape-client/src/main/java/class222.java delete mode 100644 runescape-client/src/main/java/class223.java create mode 100644 runescape-client/src/main/java/class224.java delete mode 100644 runescape-client/src/main/java/class225.java delete mode 100644 runescape-client/src/main/java/class226.java create mode 100644 runescape-client/src/main/java/class227.java create mode 100644 runescape-client/src/main/java/class23.java create mode 100644 runescape-client/src/main/java/class231.java create mode 100644 runescape-client/src/main/java/class232.java create mode 100644 runescape-client/src/main/java/class234.java create mode 100644 runescape-client/src/main/java/class236.java create mode 100644 runescape-client/src/main/java/class237.java delete mode 100644 runescape-client/src/main/java/class238.java create mode 100644 runescape-client/src/main/java/class247.java delete mode 100644 runescape-client/src/main/java/class248.java create mode 100644 runescape-client/src/main/java/class25.java create mode 100644 runescape-client/src/main/java/class257.java delete mode 100644 runescape-client/src/main/java/class267.java delete mode 100644 runescape-client/src/main/java/class268.java create mode 100644 runescape-client/src/main/java/class276.java create mode 100644 runescape-client/src/main/java/class277.java create mode 100644 runescape-client/src/main/java/class278.java create mode 100644 runescape-client/src/main/java/class280.java delete mode 100644 runescape-client/src/main/java/class287.java delete mode 100644 runescape-client/src/main/java/class288.java delete mode 100644 runescape-client/src/main/java/class289.java delete mode 100644 runescape-client/src/main/java/class290.java create mode 100644 runescape-client/src/main/java/class296.java create mode 100644 runescape-client/src/main/java/class297.java create mode 100644 runescape-client/src/main/java/class299.java delete mode 100644 runescape-client/src/main/java/class30.java create mode 100644 runescape-client/src/main/java/class300.java create mode 100644 runescape-client/src/main/java/class303.java create mode 100644 runescape-client/src/main/java/class306.java rename runescape-client/src/main/java/{class301.java => class310.java} (95%) delete mode 100644 runescape-client/src/main/java/class313.java delete mode 100644 runescape-client/src/main/java/class32.java delete mode 100644 runescape-client/src/main/java/class320.java create mode 100644 runescape-client/src/main/java/class322.java delete mode 100644 runescape-client/src/main/java/class326.java create mode 100644 runescape-client/src/main/java/class329.java create mode 100644 runescape-client/src/main/java/class332.java create mode 100644 runescape-client/src/main/java/class335.java rename runescape-client/src/main/java/{class216.java => class336.java} (50%) delete mode 100644 runescape-client/src/main/java/class337.java delete mode 100644 runescape-client/src/main/java/class339.java create mode 100644 runescape-client/src/main/java/class346.java create mode 100644 runescape-client/src/main/java/class348.java create mode 100644 runescape-client/src/main/java/class39.java delete mode 100644 runescape-client/src/main/java/class40.java create mode 100644 runescape-client/src/main/java/class41.java delete mode 100644 runescape-client/src/main/java/class42.java delete mode 100644 runescape-client/src/main/java/class43.java create mode 100644 runescape-client/src/main/java/class5.java create mode 100644 runescape-client/src/main/java/class52.java rename runescape-client/src/main/java/{class47.java => class56.java} (55%) create mode 100644 runescape-client/src/main/java/class58.java create mode 100644 runescape-client/src/main/java/class6.java delete mode 100644 runescape-client/src/main/java/class65.java create mode 100644 runescape-client/src/main/java/class69.java create mode 100644 runescape-client/src/main/java/class7.java create mode 100644 runescape-client/src/main/java/class74.java create mode 100644 runescape-client/src/main/java/class8.java delete mode 100644 runescape-client/src/main/java/class80.java delete mode 100644 runescape-client/src/main/java/class81.java delete mode 100644 runescape-client/src/main/java/class83.java create mode 100644 runescape-client/src/main/java/class89.java create mode 100644 runescape-client/src/main/java/class9.java create mode 100644 runescape-client/src/main/java/class90.java create mode 100644 runescape-client/src/main/java/class92.java delete mode 100644 runescape-client/src/main/java/class96.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index bf39aa9d15..d9997072d5 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -24,12 +24,12 @@ */ object ProjectVersions { - const val launcherVersion = "2.0.4" + const val launcherVersion = "2.2.0" const val rlVersion = "1.6.9" - const val openosrsVersion = "3.1.0" + const val openosrsVersion = "3.2.0" - const val rsversion = 188 + const val rsversion = 189 const val cacheversion = 165 } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index b9c3ff931b..c6e18850d6 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("ii") +@ObfuscatedName("iy") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lmw;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1542762901 + intValue = 1088785149 ) - static int field3148; - @ObfuscatedName("t") + static int field3143; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 836955159 + intValue = -1667499623 ) @Export("groupCount") int groupCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("groupIds") int[] groupIds; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llk;" + signature = "Lmj;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Llk;" + signature = "[Lmj;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("groups") Object[] groups; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("files") Object[][] files; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 648103117 + intValue = -1296799789 ) @Export("hash") public int hash; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); - field3148 = 0; + field3143 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -86,15 +86,15 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "324274119" + garbageValue = "32768" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = Timer.method5068(var1, var1.length); - Buffer var2 = new Buffer(class2.decompressBytes(var1)); + this.hash = GrandExchangeOfferUnitPriceComparator.method225(var1, var1.length); + Buffer var2 = new Buffer(class217.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.method5592(); + this.groupCount = var2.method5778(); } 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.method5592(); + this.groupIds[var7] = var5 += var2.method5778(); 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.method5592(); + var12 = this.fileIds[var8][var11] = var5 += var2.method5778(); if (var12 > var10) { var10 = var12; } @@ -219,29 +219,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1758408707" + signature = "(IB)V", + garbageValue = "-11" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIS)[B", - garbageValue = "-10226" + signature = "(IIB)[B", + garbageValue = "-30" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II[IS)[B", - garbageValue = "-26073" + signature = "(II[II)[B", + garbageValue = "688237624" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -257,36 +257,21 @@ public abstract class AbstractArchive { } } - Object var5 = this.files[var1][var2]; - byte[] var7; - if (var5 == null) { - var7 = null; - } else if (var5 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var5); - var7 = var6; - } else { - if (!(var5 instanceof AbstractByteArrayCopier)) { - throw new IllegalArgumentException(); - } - - AbstractByteArrayCopier var8 = (AbstractByteArrayCopier)var5; - var7 = var8.get(); - } - + byte[] var5 = class39.method644(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } - return var7; + return var5; } else { return null; } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "2" + signature = "(III)Z", + garbageValue = "1871586288" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -304,12 +289,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-56" + signature = "(II)Z", + garbageValue = "-700946668" ) - public boolean method4224(int var1) { + public boolean method4251(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -319,10 +304,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1747453394" + signature = "(IB)Z", + garbageValue = "-74" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -334,10 +319,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "8" + signature = "(I)Z", + garbageValue = "2004742407" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -356,20 +341,20 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "27" + garbageValue = "9" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-1122703928" + garbageValue = "-197924565" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -382,10 +367,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIB)[B", - garbageValue = "11" + signature = "(III)[B", + garbageValue = "1361179955" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -401,32 +386,17 @@ public abstract class AbstractArchive { } } - Object var4 = this.files[var1][var2]; - byte[] var6; - if (var4 == null) { - var6 = null; - } else if (var4 instanceof byte[]) { - byte[] var5 = (byte[])((byte[])var4); - var6 = var5; - } else { - if (!(var4 instanceof AbstractByteArrayCopier)) { - throw new IllegalArgumentException(); - } - - AbstractByteArrayCopier var7 = (AbstractByteArrayCopier)var4; - var6 = var7.get(); - } - - return var6; + byte[] var4 = class39.method644(this.files[var1][var2], false); + return var4; } else { return null; } } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IB)[B", - garbageValue = "20" + garbageValue = "100" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -439,49 +409,49 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1179679189" + signature = "(IB)V", + garbageValue = "-42" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1870169263" + garbageValue = "1090009385" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "83" + garbageValue = "60" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2083361836" + signature = "(B)I", + garbageValue = "-30" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2144159595" + garbageValue = "504262227" ) @Export("clearGroups") public void clearGroups() { @@ -491,10 +461,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1860298470" + garbageValue = "-1058828801" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -504,10 +474,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2052832906" + signature = "(B)V", + garbageValue = "3" ) @Export("clearFiles") public void clearFiles() { @@ -521,10 +491,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I[IB)Z", - garbageValue = "-1" + signature = "(I[II)Z", + garbageValue = "1499207460" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -546,67 +516,33 @@ public abstract class AbstractArchive { if (var6) { return true; } else { - byte[] var8; - Object var9; - byte[] var10; byte[] var21; - AbstractByteArrayCopier var26; - if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { - var9 = this.groups[var1]; - if (var9 == null) { - var8 = null; - } else if (var9 instanceof byte[]) { - var10 = (byte[])((byte[])var9); - var8 = WorldMapSectionType.method250(var10); - } else { - if (!(var9 instanceof AbstractByteArrayCopier)) { - throw new IllegalArgumentException(); - } - - var26 = (AbstractByteArrayCopier)var9; - var8 = var26.get(); - } - - var21 = var8; - Buffer var27 = new Buffer(var8); - var27.xteaDecrypt(var2, 5, var27.array.length); + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + var21 = class39.method644(this.groups[var1], false); } else { - var9 = this.groups[var1]; - if (var9 == null) { - var8 = null; - } else if (var9 instanceof byte[]) { - var10 = (byte[])((byte[])var9); - var8 = var10; - } else { - if (!(var9 instanceof AbstractByteArrayCopier)) { - throw new IllegalArgumentException(); - } - - var26 = (AbstractByteArrayCopier)var9; - var8 = var26.get(); - } - - var21 = var8; + var21 = class39.method644(this.groups[var1], true); + Buffer var8 = new Buffer(var21); + var8.xteaDecrypt(var2, 5, var8.array.length); } - var8 = class2.decompressBytes(var21); + byte[] var25 = class217.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } - int var23; + int var10; if (var3 > 1) { - int var22 = var8.length; - --var22; - var23 = var8[var22] & 255; - var22 -= var23 * var3 * 4; - Buffer var11 = new Buffer(var8); + int var9 = var25.length; + --var9; + var10 = var25[var9] & 255; + var9 -= var3 * var10 * 4; + Buffer var11 = new Buffer(var25); int[] var12 = new int[var3]; - var11.offset = var22; + var11.offset = var9; int var14; int var15; - for (int var13 = 0; var13 < var23; ++var13) { + for (int var13 = 0; var13 < var10; ++var13) { var14 = 0; for (var15 = 0; var15 < var3; ++var15) { @@ -615,23 +551,23 @@ public abstract class AbstractArchive { } } - byte[][] var24 = new byte[var3][]; + byte[][] var23 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var24[var14] = new byte[var12[var14]]; + var23[var14] = new byte[var12[var14]]; var12[var14] = 0; } - var11.offset = var22; + var11.offset = var9; var14 = 0; int var17; - for (var15 = 0; var15 < var23; ++var15) { + for (var15 = 0; var15 < var10; ++var15) { int var16 = 0; for (var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var8, var14, var24[var17], var12[var17], var16); + System.arraycopy(var25, var14, var23[var17], var12[var17], var16); var12[var17] += var16; var14 += var16; } @@ -640,7 +576,7 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { var17 = var4[var15]; - byte[] var19 = var24[var15]; + byte[] var19 = var23[var15]; Object var18; if (var19 == null) { var18 = null; @@ -654,25 +590,25 @@ public abstract class AbstractArchive { var5[var17] = var18; } else { - var5[var4[var15]] = var24[var15]; + var5[var4[var15]] = var23[var15]; } } } else if (!this.shallowFiles) { - var23 = var4[0]; - Object var28; - if (var8 == null) { - var28 = null; - } else if (var8.length > 136) { - DirectByteArrayCopier var29 = new DirectByteArrayCopier(); - var29.set(var8); - var28 = var29; + var10 = var4[0]; + Object var26; + if (var25 == null) { + var26 = null; + } else if (var25.length > 136) { + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); + var27.set(var25); + var26 = var27; } else { - var28 = var8; + var26 = var25; } - var5[var23] = var28; + var5[var10] = var26; } else { - var5[var4[0]] = var8; + var5[var4[0]] = var25; } return true; @@ -680,109 +616,109 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-674594159" + signature = "(Ljava/lang/String;S)I", + garbageValue = "-10732" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(GameShell.hashString(var1)); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)I", - garbageValue = "-1938235992" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(GameShell.hashString(var2)); + return this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); } @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;I)I", + garbageValue = "374626728" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); + return this.fileNameHashTables[var1].get(HealthBarDefinition.hashString(var2)); + } + + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1887226326" + garbageValue = "1971024882" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;B)[B", - garbageValue = "-87" + signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "-1226254785" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); + int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1903495537" + garbageValue = "-612487532" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); + int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Z", - garbageValue = "-1357995676" + signature = "(Ljava/lang/String;S)Z", + garbageValue = "5353" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "994130396" + garbageValue = "904314096" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "1917128614" + signature = "(Ljava/lang/String;B)I", + garbageValue = "-63" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); return this.groupLoadPercent(var2); } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 65e19971f5..1b613412ba 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,35 +1,852 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("hi") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("se") - @ObfuscatedGetter( - intValue = -1844063971 - ) - @Export("foundItemIndex") - static int foundItemIndex; - AbstractByteArrayCopier() { } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "-571467457" + garbageValue = "1422436059" ) @Export("get") - public abstract byte[] get(); + abstract byte[] get(); - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "1471312739" + signature = "([BB)V", + garbageValue = "0" ) @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 { + class49.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 3e717222ab..c4832bb477 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("kc") +@ObfuscatedName("kh") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "[Lli;" + signature = "[Lle;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("pixels") byte[][] pixels; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("advances") int[] advances; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("widths") int[] widths; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("heights") int[] heights; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("topBearings") int[] topBearings; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("ascent") public int ascent; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("d") + @ObfuscatedName("t") @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)method5414(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5478(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("j") + @ObfuscatedName("s") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[TextureProvider.charToByteCp1252(var1) & 255]; + return this.advances[TaskHandler.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("m") + @ObfuscatedName("p") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = VerticalAlignment.parseInt(var7.substring(4)); + int var8 = Tiles.parseInt(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { - var4 += this.advances[(char)(TextureProvider.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(TaskHandler.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("n") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = VerticalAlignment.parseInt(var16.substring(4)); + int var17 = Tiles.parseInt(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("u") @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("v") + @ObfuscatedName("h") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("x") + @ObfuscatedName("i") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("a") @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("q") + @ObfuscatedName("o") @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("z") + @ObfuscatedName("c") @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("y") + @ObfuscatedName("f") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("f") + @ObfuscatedName("ae") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("a") + @ObfuscatedName("an") @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("u") + @ObfuscatedName("ai") @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("ae") + @ObfuscatedName("ap") @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("af") + @ObfuscatedName("ab") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -582,28 +582,38 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("az") + @ObfuscatedName("ar") @Export("decodeTag") void decodeTag(String var1) { try { + int var2; + String var3; if (var1.startsWith("col=")) { - AbstractFont_color = ScriptEvent.method1202(var1.substring(4), 16); + var3 = var1.substring(4); + var2 = class105.parseIntCustomRadix(var3, 16, true); + AbstractFont_color = var2; } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - AbstractFont_strike = ScriptEvent.method1202(var1.substring(4), 16); + var3 = var1.substring(4); + var2 = class105.parseIntCustomRadix(var3, 16, true); + AbstractFont_strike = var2; } else if (var1.equals("str")) { AbstractFont_strike = 8388608; } else if (var1.equals("/str")) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { - AbstractFont_underline = ScriptEvent.method1202(var1.substring(2), 16); + var3 = var1.substring(2); + var2 = class105.parseIntCustomRadix(var3, 16, true); + AbstractFont_underline = var2; } else if (var1.equals("u")) { AbstractFont_underline = 0; } else if (var1.equals("/u")) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { - AbstractFont_shadow = ScriptEvent.method1202(var1.substring(5), 16); + var3 = var1.substring(5); + var2 = class105.parseIntCustomRadix(var3, 16, true); + AbstractFont_shadow = var2; } else if (var1.equals("shad")) { AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { @@ -611,12 +621,12 @@ public abstract class AbstractFont extends Rasterizer2D { } else if (var1.equals("br")) { this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var3) { + } catch (Exception var5) { } } - @ObfuscatedName("ax") + @ObfuscatedName("af") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -639,7 +649,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aj") + @ObfuscatedName("at") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -648,7 +658,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(TaskHandler.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -662,7 +672,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = VerticalAlignment.parseInt(var8.substring(4)); + var9 = Tiles.parseInt(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -728,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("au") + @ObfuscatedName("as") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -738,7 +748,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { if (var1.charAt(var9) != 0) { - char var10 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(TaskHandler.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -767,7 +777,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; - var14 = VerticalAlignment.parseInt(var11.substring(4)); + var14 = Tiles.parseInt(var11.substring(4)); IndexedSprite var15 = AbstractFont_modIconSprites[var14]; var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); var2 += var15.width; @@ -846,8 +856,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("l") - static int method5414(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("e") + static int method5478(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]; @@ -882,7 +892,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("n") + @ObfuscatedName("g") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -911,7 +921,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("ay") + @ObfuscatedName("am") @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; @@ -953,7 +963,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aa") + @ObfuscatedName("au") @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); @@ -1001,7 +1011,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aq") + @ObfuscatedName("ao") @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; @@ -1043,7 +1053,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("as") + @ObfuscatedName("aq") @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 dea087d471..22c26c67c1 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lj") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("o") + @ObfuscatedName("a") + public static String[] field3871; + @ObfuscatedName("k") @Export("pixels") public int[] pixels; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -677565243 + intValue = 2037520285 ) @Export("width") public int width; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1515017949 + intValue = -645523785 ) @Export("height") public int height; @@ -26,51 +28,29 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-529782293" + garbageValue = "1321130014" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "934582222" + signature = "(IIIIS)V", + garbageValue = "32475" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-96" + signature = "(I)V", + garbageValue = "1783812684" ) @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-569880085" - ) - static boolean method6151() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var0.isLoaded()) { - return false; - } - - ++Client.archiveLoadersDone; - } - - return true; - } else { - return true; - } - } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index e7b763efee..7cd736fbc1 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,57 +4,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("lt") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-259367480" + signature = "(B)V", + garbageValue = "7" ) @Export("close") public abstract void close(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-108" + signature = "(I)I", + garbageValue = "1436175029" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2004103994" + garbageValue = "195119972" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-624446357" + signature = "(IB)Z", + garbageValue = "0" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1847434030" + signature = "([BIIB)I", + garbageValue = "33" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "977025272" + garbageValue = "-2040746201" ) @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 6edd0df6c4..8ba4d7daca 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("dd") +@ObfuscatedName("df") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 43ffce806c..dcd7c2db87 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -3,21 +3,25 @@ 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("jx") +@ObfuscatedName("js") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("t") + @ObfuscatedName("k") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("m") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;B)V", - garbageValue = "71" + signature = "(Ljava/util/Comparator;I)V", + garbageValue = "747268472" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +33,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljk;Ljk;I)I", - garbageValue = "-1613196050" + signature = "(Ljd;Ljd;I)I", + garbageValue = "1451673304" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -43,45 +47,139 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("c") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1320582539" + signature = "(ILce;ZI)I", + garbageValue = "-729583156" ) - static int method5119(int var0, int var1) { - FloorOverlayDefinition var2 = ArchiveLoader.FloorUnderlayDefinition_get(var0); - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else if (var2.texture >= 0) { - int var3 = class218.method4178(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; + 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 var4 = var2.hue; - int var5 = var2.saturation; - int var6 = var2.lightness; - if (var6 > 179) { - var5 /= 2; - } + 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] = class201.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] = class201.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; + } - if (var6 > 192) { - var5 /= 2; - } + 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; + } - if (var6 > 217) { - var5 /= 2; + 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; + } } - - if (var6 > 243) { - var5 /= 2; - } - - int var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); - int var8 = class218.method4178(var7, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; } } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 9d900a668c..5c17d81d7f 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,123 +1,123 @@ +import java.util.Date; 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("b") +@ObfuscatedName("ab") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = 1805663379 - ) - static int field190; - @ObfuscatedName("gv") + @ObfuscatedName("qb") @ObfuscatedSignature( - signature = "[Llt;" + signature = "Ldw;" ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; @ObfuscatedName("c") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -894906368 + intValue = -1424511881 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1390111808 + intValue = -338405967 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1468899765 + intValue = -407468573 ) @Export("regionX") int regionX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1986069101 + intValue = -62405571 ) @Export("regionY") int regionY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1726472533 + intValue = 594626733 ) @Export("minPlane") int minPlane; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1228656521 + intValue = 275280081 ) @Export("planes") int planes; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -672684543 + intValue = 1377406919 ) @Export("groupId") int groupId; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -199023581 + intValue = -687693039 ) @Export("fileId") int fileId; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("floorOverlayIds") short[][][] floorOverlayIds; + @ObfuscatedName("s") + byte[][][] field205; @ObfuscatedName("p") - byte[][][] field188; - @ObfuscatedName("h") - byte[][][] field175; - @ObfuscatedName("v") + byte[][][] field206; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[[[[Lu;" + signature = "[[[[Lal;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("n") - boolean field174; - @ObfuscatedName("x") - boolean field185; + @ObfuscatedName("u") + boolean field210; + @ObfuscatedName("h") + boolean field209; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field174 = false; - this.field185 = false; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lkp;S)V", - garbageValue = "-30591" - ) - @Export("readGeography") - abstract void readGeography(Buffer var1); - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1888663118" - ) - @Export("isFullyLoaded") - boolean isFullyLoaded() { - return this.field174 && this.field185; + this.field210 = false; + this.field209 = false; } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lii;I)V", - garbageValue = "-60010713" + signature = "(Lkb;B)V", + garbageValue = "-78" + ) + @Export("readGeography") + abstract void readGeography(Buffer var1); + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-2034466824" + ) + @Export("isFullyLoaded") + boolean isFullyLoaded() { + return this.field210 && this.field209; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(Liy;I)V", + garbageValue = "-1013927348" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -125,53 +125,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field174 = true; - this.field185 = true; + this.field210 = true; + this.field209 = true; } } } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "559104793" + garbageValue = "778691024" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field188 = null; - this.field175 = null; + this.field205 = null; + this.field206 = null; this.decorations = null; - this.field174 = false; - this.field185 = false; + this.field210 = false; + this.field209 = false; } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IILkp;I)V", - garbageValue = "-1538793396" + signature = "(IILkb;B)V", + garbageValue = "20" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method257(var1, var2, var3, var4); + this.method355(var1, var2, var3, var4); } else { - this.method258(var1, var2, var3, var4); + this.method372(var1, var2, var3, var4); } } } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IILkp;II)V", - garbageValue = "1470319349" + signature = "(IILkb;IB)V", + garbageValue = "-123" ) - void method257(int var1, int var2, Buffer var3, int var4) { + void method355(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 +180,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IILkp;II)V", - garbageValue = "-2109689105" + signature = "(IILkb;II)V", + garbageValue = "-1501964087" ) - void method258(int var1, int var2, Buffer var3, int var4) { + void method372(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 +201,8 @@ public abstract class AbstractWorldMapData { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field188[var9][var1][var2] = (byte)(var11 >> 2); - this.field175[var9][var1][var2] = (byte)(var11 & 3); + this.field205[var9][var1][var2] = (byte)(var11 >> 2); + this.field206[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -214,7 +214,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5593(); + int var12 = var3.method5591(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -224,23 +224,349 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1419701819" + garbageValue = "-1491010463" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "879615206" + garbageValue = "-1765071550" ) @Export("getRegionY") int getRegionY() { return this.regionY; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IB)Ljx;", + garbageValue = "86" + ) + @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; + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "99208963" + ) + 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; + } + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1350082309" + ) + 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; + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 784a5ae7b4..7faa6bb917 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,40 +1,69 @@ -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("aq") +@ObfuscatedName("ax") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("qk") + @ObfuscatedName("sq") @ObfuscatedGetter( - intValue = -1430527955 + intValue = -1106675929 ) - static int field306; - @ObfuscatedName("d") + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("dx") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("dy") + @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;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lhj;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -503139537 + intValue = -1506769643 ) @Export("screenX") int screenX; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1934442125 + intValue = -896182235 ) @Export("screenY") int screenY; @@ -47,42 +76,42 @@ public abstract class AbstractWorldMapIcon { this.coord2 = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1499764486" + signature = "(B)I", + garbageValue = "16" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Laz;", - garbageValue = "124" + signature = "(I)Lau;", + garbageValue = "2077771117" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "-26101" + signature = "(I)I", + garbageValue = "650401890" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-1828864081" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-671812733" + garbageValue = "-57056512" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -93,64 +122,62 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-18" + signature = "(S)Z", + garbageValue = "-32437" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "1514075887" + garbageValue = "1127928990" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = PacketBufferNode.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = class25.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { return false; } break; case 1: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } return false; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { + if (var1 <= this.screenX - var4 || var1 > this.screenX) { return false; } } switch(var3.verticalAlignment.value) { case 0: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { - break; - } - - return false; - case 1: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { - break; - } - - return false; - case 2: if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } + break; + 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) { + return false; + } } return true; @@ -160,7 +187,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-543519402" + garbageValue = "-411865092" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -168,305 +195,19 @@ 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 <= var3.height + this.screenY; + return var2 >= this.screenY && var2 <= this.screenY + var3.height; } else { return false; } } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lks;ILba;IB)V", - garbageValue = "91" + signature = "(CB)Z", + garbageValue = "0" ) - static final void method613(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - if ((var3 & 1024) != 0) { - var2.field981 = var0.method5618(); - var2.field957 = var0.method5780(); - var2.field961 = var0.method5618(); - var2.field991 = var0.readByte(); - var2.field985 = var0.method5762() + Client.cycle; - var2.field986 = var0.method5762() + Client.cycle; - var2.field987 = var0.method5740(); - if (var2.field621) { - var2.field981 += var2.tileX; - var2.field957 += var2.tileY; - var2.field961 += var2.tileX; - var2.field991 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field981 += var2.pathX[0]; - var2.field957 += var2.pathY[0]; - var2.field961 += var2.pathX[0]; - var2.field991 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field998 = 0; - } - - int var5; - if ((var3 & 4096) != 0) { - var2.spotAnimation = var0.readUnsignedShort(); - var5 = var0.readInt(); - var2.field980 = var5 >> 16; - var2.field979 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field979 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - int var6; - int var8; - int var9; - int var12; - if ((var3 & 64) != 0) { - var5 = var0.readUnsignedByte(); - int var7; - int var10; - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.method5605(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.method5771(); - var12 = var9 > 0 ? var0.method5771() : var11; - var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var2.removeHealthBar(var8); - } - } - } - } - - if ((var3 & 2048) != 0) { - Players.field1237[var1] = var0.method5618(); - } - - if ((var3 & 32) != 0) { - var5 = var0.method5614(); - PlayerType var13 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var0.method5771()); - boolean var17 = var0.readUnsignedByte() == 1; - var8 = var0.method5605(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var18 = false; - if (var13.isUser && KeyHandler.friendSystem.isIgnored(var2.username)) { - var18 = true; - } - - if (!var18 && Client.field759 == 0 && !var2.isHidden) { - Players.field1248.offset = 0; - var0.readBytes(Players.field1248.array, 0, var8); - Players.field1248.offset = 0; - String var14 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(Players.field1248))); - var2.overheadText = var14.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var17; - var2.field954 = var2 != class192.localPlayer && var13.isUser && "" != Client.field780 && var14.toLowerCase().indexOf(Client.field780) == -1; - if (var13.isPrivileged) { - var12 = var17 ? 91 : 1; - } else { - var12 = var17 ? 90 : 2; - } - - if (var13.modIcon != -1) { - ClientPreferences.addGameMessage(var12, Language.method3728(var13.modIcon) + var2.username.getName(), var14); - } else { - ClientPreferences.addGameMessage(var12, var2.username.getName(), var14); - } - } - } - - var0.offset = var8 + var9; - } - - if ((var3 & 1) != 0) { - var5 = var0.method5740(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method5605(); - InterfaceParent.performPlayerAnimation(var2, var5, var6); - } - - if ((var3 & 512) != 0) { - var4 = var0.method5609(); - } - - if ((var3 & 2) != 0) { - var2.targetIndex = var0.readUnsignedShort(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 8) != 0) { - var5 = var0.method5771(); - byte[] var19 = new byte[var5]; - Buffer var15 = new Buffer(var19); - var0.readBytes(var19, 0, var5); - Players.field1235[var1] = var15; - var2.read(var15); - } - - if ((var3 & 256) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 16) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == class192.localPlayer) { - ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if ((var3 & 128) != 0) { - var2.field967 = var0.readUnsignedShort(); - if (var2.pathLength == 0) { - var2.orientation = var2.field967; - var2.field967 = -1; - } - } - - if (var2.field621) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var16; - if (var4 != -1) { - var16 = var4; - } else { - var16 = Players.field1237[var1]; - } - - var2.method1266(var2.tileX, var2.tileY, var16); - } - } - - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(Lff;III)Ldw;", - garbageValue = "1204269673" - ) - public static final PcmPlayer method627(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field1398 == 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.field1401 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (GrandExchangeEvent.field45 > 0 && UserComparator2.soundSystem == null) { - UserComparator2.soundSystem = new SoundSystem(); - Frames.soundSystemExecutor = Executors.newScheduledThreadPool(1); - Frames.soundSystemExecutor.scheduleAtFixedRate(UserComparator2.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (UserComparator2.soundSystem != null) { - if (UserComparator2.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - UserComparator2.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("fa") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "926175900" - ) - @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("kt") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "4" - ) - static void method628(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(); - } - } - + @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/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 103fce3dac..91e8744ff1 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,27 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("mb") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("file") RandomAccessFile file; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -6958977035237183007L + longValue = 1632378019072179927L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -8139275980542647059L + longValue = 3271085237778542147L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { + if (var3 == -1L) { var3 = Long.MAX_VALUE; } @@ -49,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-1955646442" + signature = "([BIIB)V", + garbageValue = "47" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -73,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1993690958" + signature = "(B)V", + garbageValue = "10" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "1689425186" + garbageValue = "2141113619" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "1409759117" + signature = "(B)J", + garbageValue = "74" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-1292209502" + garbageValue = "-316484023" ) @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 82e1292d2f..b7799ce150 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,326 +4,320 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("cw") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("hw") + @ObfuscatedName("an") + @Export("isWalking") + boolean isWalking; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1081089529 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -892372587 + intValue = -1730088457 ) @Export("x") int x; - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -340039451 + intValue = 58548893 ) @Export("y") int y; - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 349053657 + intValue = 2047396387 ) @Export("rotation") int rotation; - @ObfuscatedName("ay") - @Export("isWalking") - boolean isWalking; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -697437632 + intValue = 747650361 ) - int field942; - @ObfuscatedName("aq") + int field976; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1907492229 + intValue = 1154559573 ) @Export("playerCycle") int playerCycle; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1598432795 + intValue = 399800473 ) @Export("readySequence") int readySequence; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -291727723 + intValue = -684262003 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1728008405 + intValue = -1952661919 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1086097041 + intValue = 2064847885 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1467237959 + intValue = 1807346449 ) @Export("walkBackSequence") int walkBackSequence; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1983487081 + intValue = -598231963 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 849163825 + intValue = -1622741341 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1212229631 + intValue = 1458798213 ) @Export("runSequence") int runSequence; - @ObfuscatedName("am") + @ObfuscatedName("ax") @Export("overheadText") String overheadText; - @ObfuscatedName("ao") + @ObfuscatedName("az") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("at") - boolean field954; - @ObfuscatedName("an") + @ObfuscatedName("aj") + boolean field988; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 411062959 + intValue = -1807093205 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ag") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 303951077 + intValue = -1168789031 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1337341867 + intValue = -54296883 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ap") + @ObfuscatedName("ag") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ah") + @ObfuscatedName("aw") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bc") + @ObfuscatedName("bo") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bb") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljm;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -186074271 + intValue = 1906218843 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("false0") boolean false0; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 49507657 + intValue = -1444761415 ) - int field967; - @ObfuscatedName("by") + int field1015; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1446195429 + intValue = 1296285639 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 707889715 + intValue = -1097128947 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bw") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1510221367 + intValue = 1112091343 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bt") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 2138595105 + intValue = -20846645 ) @Export("sequence") int sequence; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1231128891 + intValue = 1620009483 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bm") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -733211881 + intValue = 1370333627 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("ba") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 825906927 + intValue = -1532646011 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -768397183 + intValue = 743745547 ) - int field983; + int field1011; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 340005731 + intValue = -1600718851 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1782758549 + intValue = -595193051 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bh") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 794012987 + intValue = -1426517203 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 2005510657 + intValue = 1048299633 ) - int field979; - @ObfuscatedName("bz") + int field1013; + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1479778797 + intValue = 1503080001 ) - int field980; + int field1033; + @ObfuscatedName("by") + @ObfuscatedGetter( + intValue = 1317270699 + ) + int field990; @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1805966651 + intValue = 1667801647 ) - int field981; - @ObfuscatedName("bu") + int field972; + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 491483643 + intValue = 441172781 ) - int field961; - @ObfuscatedName("bv") + int field1017; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 479016033 + intValue = -1550774947 ) - int field957; - @ObfuscatedName("bo") + int field1018; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1112662559 + intValue = -625975993 ) - int field991; - @ObfuscatedName("br") + int field1019; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -71204417 + intValue = 1067146179 ) - int field985; - @ObfuscatedName("cp") + int field1020; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 78951405 + intValue = 1247809135 ) - int field986; - @ObfuscatedName("cg") + int field1021; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 179265201 - ) - int field987; - @ObfuscatedName("cr") - @ObfuscatedGetter( - intValue = -787364139 + intValue = 1215799343 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("co") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 1402601371 + intValue = 1881116621 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("ck") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 186982923 + intValue = 616594567 ) @Export("orientation") int orientation; - @ObfuscatedName("cn") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 661505811 + intValue = 230967505 ) - int field956; - @ObfuscatedName("cd") + int field1025; + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 1778571567 + intValue = 2061571405 ) - int field975; - @ObfuscatedName("ct") + int field1026; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1795737793 + intValue = -525774551 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cb") + @ObfuscatedName("cs") @Export("pathX") int[] pathX; - @ObfuscatedName("cf") + @ObfuscatedName("cg") @Export("pathY") int[] pathY; - @ObfuscatedName("cm") + @ObfuscatedName("cd") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cz") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -1512455111 + intValue = -1741747755 ) - int field997; - @ObfuscatedName("cu") + int field1031; + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -737673093 + intValue = -932937077 ) - int field998; + int field1032; Actor() { this.isWalking = false; - this.field942 = 64; + this.field976 = 1; this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -333,7 +327,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field954 = false; + this.field988 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -346,7 +340,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field967 = -1; + this.field1015 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -354,46 +348,46 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field983 = 0; + this.field1011 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field956 = 0; - this.field975 = 32; + this.field1025 = 0; + this.field1026 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field997 = 0; - this.field998 = 0; + this.field1031 = 0; + this.field1032 = 0; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-515224238" + garbageValue = "116176402" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("ai") + @ObfuscatedName("bu") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-847107041" + garbageValue = "-1960813077" ) - final void method1740() { + final void method1842() { this.pathLength = 0; - this.field998 = 0; + this.field1032 = 0; } - @ObfuscatedName("ab") + @ObfuscatedName("be") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "-913342353" + garbageValue = "-1774762927" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -413,52 +407,38 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); - HitSplatDefinition var12; - if (var13 != null) { - var12 = var13; - } else { - byte[] var14 = class49.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.field3337; - var11 = var12.field3328; + HitSplatDefinition var12 = GrandExchangeOfferUnitPriceComparator.method213(var1); + var10 = var12.field3327; + var11 = var12.field3329; } - int var15; + int var14; if (var8) { if (var10 == -1) { return; } var9 = 0; - var15 = 0; + var14 = 0; if (var10 == 0) { - var15 = this.hitSplatCycles[0]; + var14 = this.hitSplatCycles[0]; } else if (var10 == 1) { - var15 = this.hitSplatValues[0]; + var14 = this.hitSplatValues[0]; } - for (int var16 = 1; var16 < 4; ++var16) { + for (int var13 = 1; var13 < 4; ++var13) { if (var10 == 0) { - if (this.hitSplatCycles[var16] < var15) { - var9 = var16; - var15 = this.hitSplatCycles[var16]; + if (this.hitSplatCycles[var13] < var14) { + var9 = var13; + var14 = this.hitSplatCycles[var13]; } - } else if (var10 == 1 && this.hitSplatValues[var16] < var15) { - var9 = var16; - var15 = this.hitSplatValues[var16]; + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { + var9 = var13; + var14 = this.hitSplatValues[var13]; } } - if (var10 == 1 && var15 >= var2) { + if (var10 == 1 && var14 >= var2) { return; } } else { @@ -466,11 +446,11 @@ public abstract class Actor extends Entity { this.hitSplatCount = 0; } - for (var15 = 0; var15 < 4; ++var15) { - byte var17 = this.hitSplatCount; + for (var14 = 0; var14 < 4; ++var14) { + byte var15 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var17] <= var5) { - var9 = var17; + if (this.hitSplatCycles[var15] <= var5) { + var9 = var15; break; } } @@ -485,105 +465,107 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("ap") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "1968439377" + signature = "(IIIIIIB)V", + garbageValue = "-58" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = PacketWriter.method2329(var1); - HealthBar var8 = null; - HealthBar var9 = null; - int var10 = var7.int2; - int var11 = 0; + HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var7; + if (var8 != null) { + var7 = var8; + } else { + byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); + var8 = new HealthBarDefinition(); + if (var9 != null) { + var8.decode(new Buffer(var9)); + } - HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { - ++var11; - if (var12.definition.field3275 == var7.field3275) { - var12.put(var2 + var4, var5, var6, var3); + HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); + var7 = var8; + } + + var8 = var7; + HealthBar var14 = null; + HealthBar var10 = null; + int var11 = var7.int2; + int var12 = 0; + + HealthBar var13; + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { + ++var12; + if (var13.definition.field3276 == var8.field3276) { + var13.put(var2 + var4, var5, var6, var3); return; } - if (var12.definition.int1 <= var7.int1) { - var8 = var12; + if (var13.definition.int1 <= var8.int1) { + var14 = var13; } - if (var12.definition.int2 > var10) { - var9 = var12; - var10 = var12.definition.int2; + if (var13.definition.int2 > var11) { + var10 = var13; + var11 = var13.definition.int2; } } - if (var9 != null || var11 < 4) { - var12 = new HealthBar(var7); - if (var8 == null) { - this.healthBars.addLast(var12); + if (var10 != null || var12 < 4) { + var13 = new HealthBar(var8); + if (var14 == null) { + this.healthBars.addLast(var13); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); + IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); } - var12.put(var2 + var4, var5, var6, var3); - if (var11 >= 4) { - var9.remove(); + var13.put(var2 + var4, var5, var6, var3); + if (var12 >= 4) { + var10.remove(); } } } - @ObfuscatedName("ah") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "51" + signature = "(II)V", + garbageValue = "671360815" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = PacketWriter.method2329(var1); + HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); + var3 = new HealthBarDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4)); + } - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { - if (var2 == var3.definition) { - var3.remove(); + HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); + var2 = var3; + } + + var3 = var2; + + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { + if (var3 == var5.definition) { + var5.remove(); return; } } } - @ObfuscatedName("l") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(IIZB)Ljava/lang/String;", - garbageValue = "91" + signature = "(II)I", + garbageValue = "-2086656267" ) - static String method1741(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; - } - - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); - } - } - - return new String(var5); - } else { - return Integer.toString(var0, var1); - } - } else { - throw new IllegalArgumentException("" + var1); - } + static int method1860(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1128 - 7.0D) * 256.0D); } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index f49d79426f..62ed6abd7f 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("dh") +@ObfuscatedName("eh") @Implements("Animation") public class Animation { - @ObfuscatedName("c") - static int[] field1628; - @ObfuscatedName("t") - static int[] field1621; - @ObfuscatedName("o") - static int[] field1627; - @ObfuscatedName("e") - static int[] field1623; - @ObfuscatedName("i") + @ObfuscatedName("x") + static int[] field1651; + @ObfuscatedName("m") + static int[] field1655; + @ObfuscatedName("k") + static int[] field1650; + @ObfuscatedName("d") + static int[] field1654; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lec;" + signature = "Leb;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("transformCount") int transformCount; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("transformXs") int[] transformXs; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("transformYs") int[] transformYs; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("transformZs") int[] transformZs; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1628 = new int[500]; - field1621 = new int[500]; - field1627 = new int[500]; - field1623 = new int[500]; + field1651 = new int[500]; + field1655 = new int[500]; + field1650 = new int[500]; + field1654 = new int[500]; } @ObfuscatedSignature( - signature = "([BLec;)V" + signature = "([BLeb;)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) { - field1628[var7] = var10; - field1621[var7] = 0; - field1627[var7] = 0; - field1623[var7] = 0; + field1651[var7] = var10; + field1655[var7] = 0; + field1650[var7] = 0; + field1654[var7] = 0; ++var7; break; } } } - field1628[var7] = var8; + field1651[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1621[var7] = var4.readShortSmart(); + field1655[var7] = var4.readShortSmart(); } else { - field1621[var7] = var11; + field1655[var7] = var11; } if ((var9 & 2) != 0) { - field1627[var7] = var4.readShortSmart(); + field1650[var7] = var4.readShortSmart(); } else { - field1627[var7] = var11; + field1650[var7] = var11; } if ((var9 & 4) != 0) { - field1623[var7] = var4.readShortSmart(); + field1654[var7] = var4.readShortSmart(); } else { - field1623[var7] = var11; + field1654[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] = field1628[var8]; - this.transformXs[var8] = field1621[var8]; - this.transformYs[var8] = field1627[var8]; - this.transformZs[var8] = field1623[var8]; + this.transformSkeletonLabels[var8] = field1651[var8]; + this.transformXs[var8] = field1655[var8]; + this.transformYs[var8] = field1650[var8]; + this.transformZs[var8] = field1654[var8]; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 3dc0480d65..563a702cf9 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,194 +5,200 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("ih") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lky;" + signature = "Llq;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lky;" + signature = "Llq;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1512012277 + intValue = -523982811 ) @Export("index") int index; - @ObfuscatedName("u") - volatile boolean field3159; + @ObfuscatedName("f") + volatile boolean field3154; @ObfuscatedName("ae") - boolean field3165; - @ObfuscatedName("af") + boolean field3156; + @ObfuscatedName("an") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 291322429 + intValue = 379652259 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1082053615 + intValue = 1679567941 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1711156023 + intValue = 843484953 ) - int field3157; + int field3161; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - signature = "(Lky;Lky;IZZZ)V" + signature = "(Llq;Llq;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.field3159 = false; - this.field3165 = false; - this.field3157 = -1; + this.field3154 = false; + this.field3156 = false; + this.field3161 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3165 = var6; - class83.method2110(this, this.index); + this.field3156 = var6; + class3.method58(this, this.index); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-11" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + int var2 = this.index; + long var3 = (long)((var2 << 16) + var1); + NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); + if (var5 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var5); + } + } @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1758408707" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - class210.method4032(this.index, var1); - } - - @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "27" + garbageValue = "9" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; - } else if (this.validGroups[var1]) { - return 100; } else { - int var3 = this.index; - long var4 = (long)((var3 << 16) + var1); - int var2; - if (GrandExchangeEvent.NetCache_currentResponse != null && GrandExchangeEvent.NetCache_currentResponse.key == var4) { - var2 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1; - } else { - var2 = 0; - } - - return var2; + return this.validGroups[var1] ? 100 : class3.method59(this.index, var1); } } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1179679189" + signature = "(IB)V", + garbageValue = "-42" ) @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - NetSocket.method3613(var1, this.archiveDisk, this); + DynamicObject.method2342(var1, this.archiveDisk, this); } else { - BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + Frames.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("dc") + @ObfuscatedName("ct") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-757168814" + garbageValue = "1875788056" ) - public boolean method4372() { - return this.field3159; + public boolean method4343() { + return this.field3154; } - @ObfuscatedName("dj") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1215614912" + garbageValue = "1046602653" ) @Export("percentage") public int percentage() { - if (this.field3159) { + if (this.field3154) { return 100; } else if (super.groups != null) { return 99; } else { - int var2 = this.index; - long var3 = (long)(var2 + 16711680); - int var1; - if (GrandExchangeEvent.NetCache_currentResponse != null && var3 == GrandExchangeEvent.NetCache_currentResponse.key) { - var1 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1; - } else { - var1 = 0; - } - - int var5 = var1; + int var1 = class3.method59(255, this.index); if (var1 >= 100) { - var5 = 99; + var1 = 99; } - return var5; + return var1; } } - @ObfuscatedName("de") + @ObfuscatedName("ca") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "0" + garbageValue = "60" ) @Export("loadIndex") - void loadIndex(int var1, int var2) { + public void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { - NetSocket.method3613(this.index, this.masterDisk, this); + DynamicObject.method2342(this.index, this.masterDisk, this); } else { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("df") + @ObfuscatedName("cj") @ObfuscatedSignature( signature = "(I[BZZI)V", - garbageValue = "1506082666" + garbageValue = "-1921982231" ) @Export("write") - void write(int var1, byte[] var2, boolean var3, boolean var4) { + public void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3159) { + if (this.field3154) { throw new RuntimeException(); } if (this.masterDisk != null) { - BuddyRankComparator.method3507(this.index, var2, this.masterDisk); + 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; + } } this.decodeIndex(var2); @@ -201,44 +207,44 @@ 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) { - BuddyRankComparator.method3507(var1, var2, this.archiveDisk); + WallDecoration.method3402(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - Object[] var5 = super.groups; - Object var7; + Object[] var11 = super.groups; + Object var15; if (var2 == null) { - var7 = null; + var15 = null; } else if (var2.length > 136) { DirectByteArrayCopier var8 = new DirectByteArrayCopier(); var8.set(var2); - var7 = var8; + var15 = var8; } else { - var7 = var2; + var15 = var2; } - var5[var1] = var7; + var11[var1] = var15; } } } - @ObfuscatedName("dn") + @ObfuscatedName("cp") @ObfuscatedSignature( - signature = "(Lky;I[BZB)V", - garbageValue = "-124" + signature = "(Llq;I[BZI)V", + garbageValue = "246844871" ) @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3159) { + if (this.field3154) { throw new RuntimeException(); } if (var3 == null) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } @@ -246,11 +252,11 @@ public class Archive extends AbstractArchive { Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } - Buffer var11 = new Buffer(class2.decompressBytes(var3)); + Buffer var11 = new Buffer(class217.decompressBytes(var3)); int var12 = var11.readUnsignedByte(); if (var12 != 5 && var12 != 6) { throw new RuntimeException(var12 + "," + this.index + "," + var2); @@ -262,21 +268,21 @@ public class Archive extends AbstractArchive { } if (var8 != this.indexVersion) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } this.decodeIndex(var3); this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3157) { - this.field3159 = true; + if (!var4 && var2 == this.field3161) { + this.field3154 = true; } if (var3 == null || var3.length <= 2) { this.validGroups[var2] = false; - if (this.field3165 || var4) { - BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3156 || var4) { + Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -288,8 +294,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.field3165 || var4) { - BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3156 || var4) { + Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -315,10 +321,10 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("dy") + @ObfuscatedName("ck") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-901365537" + garbageValue = "-539943157" ) @Export("loadAllLocal") void loadAllLocal() { @@ -330,56 +336,46 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3159 = true; + this.field3154 = true; } else { - this.field3157 = -1; + this.field3161 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - ArchiveDisk var2 = this.archiveDisk; - ArchiveDiskAction var4 = new ArchiveDiskAction(); - var4.type = 1; - var4.key = (long)var1; - var4.archiveDisk = var2; - var4.archive = this; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); - } - - NetSocket.method3595(); - this.field3157 = var1; + class228.method4204(var1, this.archiveDisk, this); + this.field3161 = var1; } } - if (this.field3157 == -1) { - this.field3159 = true; + if (this.field3161 == -1) { + this.field3154 = true; } } } - @ObfuscatedName("dq") + @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1567701044" + signature = "(IB)Z", + garbageValue = "18" ) - public boolean method4347(int var1) { + public boolean method4352(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("dd") + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-507892306" + garbageValue = "2030059947" ) - public boolean method4348(int var1) { + public boolean method4353(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("dr") + @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1870889361" + signature = "(B)I", + garbageValue = "110" ) @Export("loadPercent") public int loadPercent() { diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 3ef4d5dddd..21a96969d1 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,45 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("lq") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("c") + @ObfuscatedName("qh") + @ObfuscatedSignature( + signature = "Lla;" + ) + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("x") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lme;" + signature = "[Lle;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lms;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lme;" + signature = "Lms;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 92062517 + intValue = 1224222019 ) @Export("archive") int archive; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1875566271 + intValue = -1681615989 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +54,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILme;Lme;I)V" + signature = "(ILms;Lms;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -54,10 +66,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "1862196910" + garbageValue = "-613554322" ) @Export("read") public byte[] read(int var1) { @@ -81,8 +93,9 @@ public final class ArchiveDisk { } else { byte[] var5 = new byte[var3]; int var6 = 0; + int var7 = 0; - for (int var7 = 0; var6 < var3; ++var7) { + while (var6 < var3) { if (var4 == 0) { var10000 = null; return (byte[])var10000; @@ -112,30 +125,32 @@ public final class ArchiveDisk { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var10 != var7 || var12 != this.archive) { + if (var9 == var1 && var10 == var7 && var12 == this.archive) { + if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { + int var14 = var8 + var13; + + for (int var15 = var13; var15 < var14; ++var15) { + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; + ++var7; + continue; + } + var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } - - int var14 = var13 + var8; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; + var10000 = null; + return (byte[])var10000; } byte[] var20 = var5; @@ -148,10 +163,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I[BII)Z", - garbageValue = "2136581865" + garbageValue = "-1923242861" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +184,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I[BIZI)Z", - garbageValue = "-1086221243" + garbageValue = "2120818840" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -213,18 +228,18 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { - label172: { + label171: { int var9 = 0; int var10; if (var4) { - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); int var11; int var12; if (var1 > 65535) { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); } catch (EOFException var17) { - break label172; + break label171; } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); @@ -235,7 +250,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); } catch (EOFException var16) { - break label172; + break label171; } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); @@ -262,7 +277,7 @@ public final class ArchiveDisk { ++var9; } - if (var9 == var6) { + if (var6 == var9) { ++var9; } } @@ -282,7 +297,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -304,7 +319,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -333,4 +348,34 @@ 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 61515f9629..679f338055 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,86 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("ir") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("ky") - @ObfuscatedGetter( - intValue = 1465828327 + @ObfuscatedName("de") + @ObfuscatedSignature( + signature = "Lih;" ) - @Export("menuX") - static int menuX; - @ObfuscatedName("c") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 529558381 + intValue = -1964239455 ) @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("data") - byte[] data; - @ObfuscatedName("o") + public byte[] data; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lky;" + signature = "Llq;" ) @Export("archiveDisk") - ArchiveDisk archiveDisk; - @ObfuscatedName("e") + public ArchiveDisk archiveDisk; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lih;" ) @Export("archive") - Archive archive; + public Archive archive; ArchiveDiskAction() { } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-2068094459" - ) - public static String method4216(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 = TextureProvider.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("v") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "57" - ) - @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/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 123f1dfb5f..26e3bb6f0e 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,40 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("ip") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("ArchiveDiskActionHandler_requestQueue") - static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("t") + public static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("ArchiveDiskActionHandler_responseQueue") - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("e") + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 416833363 + intValue = -191724831 ) - public static int field3150; - @ObfuscatedName("i") + public static int field3151; + @ObfuscatedName("d") @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3150 = 0; + field3151 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -66,393 +60,38 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3150 <= 1) { - field3150 = 0; + if (field3151 <= 1) { + field3151 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3150 = 600; + field3151 = 600; } } else { - FriendLoginUpdate.method5325(100L); + class169.method3541(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3150 <= 1) { - field3150 = 0; + if (field3151 <= 1) { + field3151 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3150; + --field3151; } } } } catch (Exception var13) { - class225.RunException_sendStackTrace((String)null, var13); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("d") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(IIIIIILem;Lfv;I)V", - garbageValue = "-1749856384" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-492522565" ) - static final void method4336(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 = Occluder.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = GameShell.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - ObjectSound.method1931(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.method3165(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = UrlRequest.field1940[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.field508[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - InterfaceParent.field565[var0][var1][var2] = 50; - InterfaceParent.field565[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - InterfaceParent.field565[var0][var1][var2 + 1] = 50; - InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - InterfaceParent.field565[var0][var1 + 1][var2] = 50; - InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = UrlRequest.field1940[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - InterfaceParent.field565[var0][var1][var2] = 50; - InterfaceParent.field565[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3626(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3171(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.field513[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - InterfaceParent.field565[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - InterfaceParent.field565[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - InterfaceParent.field565[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3626(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.field508[var4], Tiles.field508[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 585; - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = UrlRequest.field1940[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = UrlRequest.field1940[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 1170; - var10000 = UrlRequest.field1940[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3626(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3171(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.field513[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - InterfaceParent.field565[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - InterfaceParent.field565[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - InterfaceParent.field565[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3626(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.method3165(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.method3171(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.field508[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 = Occluder.getObjectDefinition(GrandExchangeEvents.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.field508[var4], 0, var28 * Tiles.field506[var4], var28 * Tiles.field516[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = Occluder.getObjectDefinition(GrandExchangeEvents.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.field503[var4], var28 * Tiles.field517[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 = Occluder.getObjectDefinition(GrandExchangeEvents.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.field503[var4], var28 * Tiles.field517[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.method3165(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).method2952() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (int var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > InterfaceParent.field565[var0][var24 + var1][var25 + var2]) { - InterfaceParent.field565[var0][var24 + var1][var25 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } + public static int method4340(String var0) { + return var0.length() + 2; } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index df719fc61b..33b10e0f8c 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,39 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("bz") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("cj") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("gw") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llt;" - ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lia;" + signature = "Lih;" ) @Export("archive") final Archive archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -737175839 + intValue = 216071601 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1316044815 + intValue = -189862787 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Lia;Ljava/lang/String;)V" + signature = "(Lih;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -44,17 +35,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1992240637" + garbageValue = "92028555" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4348(var1) || this.archive.method4347(var1)) { + if (!this.archive.method4353(var1) || this.archive.method4352(var1)) { ++this.loadedCount; } } @@ -62,253 +53,155 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Lig;", - garbageValue = "1395082133" + signature = "(CI)Z", + garbageValue = "527367819" ) - @Export("FloorUnderlayDefinition_get") - public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; } 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; + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIIIIILem;Lfv;I)V", - garbageValue = "2035242734" + signature = "(ZB)V", + garbageValue = "-66" ) - static final void method1168(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectDefinition var9 = Occluder.getObjectDefinition(var4); - int var10; - int var11; - if (var5 != 1 && var5 != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; - } else { - var10 = var9.sizeY; - var11 = var9.sizeX; + public static void method1254(boolean var0) { + if (var0 != class169.ItemDefinition_inMembersWorld) { + class257.method4558(); + class169.ItemDefinition_inMembersWorld = var0; } - int var12; - int var13; - if (var10 + var2 <= 104) { - var12 = (var10 >> 1) + var2; - var13 = var2 + (var10 + 1 >> 1); - } else { - var12 = var2; - var13 = var2 + 1; - } + } - int var14; - int var15; - if (var3 + var11 <= 104) { - var14 = var3 + (var11 >> 1); - var15 = var3 + (var11 + 1 >> 1); - } else { - var14 = var3; - var15 = var3 + 1; - } + @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[][] var16 = Tiles.Tiles_heights[var1]; - int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2; - int var18 = (var2 << 7) + (var10 << 6); - int var19 = (var3 << 7) + (var11 << 6); - long var20 = GameShell.calculateTag(var2, var3, 2, var9.int1 == 0, var4); - int var22 = (var5 << 6) + var6; - if (var9.int3 == 1) { - var22 += 256; - } + 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); + } - Object var23; - if (var6 == 22) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(22, var5, var16, var18, var17, var19); + 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 { - var23 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var23, var20, var22); - if (var9.interactType == 1) { - var8.setBlockedByFloorDec(var2, var3); - } - - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 0) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3626(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3626(var2, var3, var6, var5, var9.boolean1); - } - - } else { - int var29; - if (var6 == 2) { - var29 = var5 + 1 & 3; - Object var24; - Object var25; - if (var9.animationId == -1 && var9.transforms == null) { - var24 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); - var25 = var9.getModel(2, var29, var16, var18, var17, var19); - } else { - var24 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - var25 = new DynamicObject(var4, 2, var29, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var24, (Entity)var25, Tiles.field508[var5], Tiles.field508[var29], var20, var22); - if (var9.interactType != 0) { - var8.method3626(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 3) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3626(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 4) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, 0, 0, var20, var22); - } else { - Object var26; - long var30; - if (var6 == 5) { - var29 = 16; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field508[var5], 0, var29 * Tiles.field506[var5], var29 * Tiles.field516[var5], var20, var22); - } else if (var6 == 6) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2; - } - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22); - } else if (var6 == 7) { - int var32 = var5 + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22); - } else if (var6 == 8) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2; - } - - int var28 = var5 + 2 & 3; - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22); - } - } - } - } else { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - if (var23 != null) { - var7.method3165(var0, var2, var3, var17, var10, var11, (Entity)var23, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } + Client.field886[var3] = true; } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 52d05ccc83..413b80c740 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,43 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cb") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -324037883 + intValue = -1084826611 ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("i") + public static int field1187; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1398359293 + intValue = -1589469367 + ) + static int field1182; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1155763571 ) @Export("id") final int id; @@ -49,179 +53,56 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-458989272" + signature = "(III)I", + garbageValue = "2128537982" ) - public static boolean method2117(int var0) { - return (var0 & 1) != 0; + 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; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } } @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lks;IB)V", - garbageValue = "100" + signature = "(I)Lle;", + garbageValue = "-2121463415" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - WorldMapIcon_0.method206(var0); - class43.method813(var0); - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "546448401" - ) - static String method2115() { - return WorldMapSection2.clientPreferences.hideUsername ? WorldMapSection2.method321(Login.Login_username) : Login.Login_username; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIIIIZI)Llt;", - garbageValue = "603666538" - ) - @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var3 << 42); - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemDefinition var9 = HealthBarDefinition.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = HealthBarDefinition.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); - if (var21 == null) { - return null; - } else { - Sprite var22 = null; - if (var9.noteTemplate != -1) { - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var22 == null) { - return null; - } - } else if (var9.notedId != -1) { - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var22 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var22 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new Sprite(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3101(16, 16); - Rasterizer3D.field1762 = false; - if (var9.placeholderTemplate != -1) { - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var21.calculateBoundsCylinder(); - var21.method2946(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var22.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var22.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - Font var19 = ItemDefinition.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) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1762 = true; - return var8; - } + 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; } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index e5c7197c1c..fe4af05ea8 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("df") +@ObfuscatedName("dc") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("g") - static float[][] field1474; - @ObfuscatedName("d") + @ObfuscatedName("v") + static float[][] field1500; + @ObfuscatedName("q") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("l") - static float field1472; - @ObfuscatedName("j") + @ObfuscatedName("z") + static float field1505; + @ObfuscatedName("t") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("pairs") int[] pairs; - @ObfuscatedName("o") - int[][][] field1467; - @ObfuscatedName("e") - int[][][] field1476; - @ObfuscatedName("i") - int[] field1469; + @ObfuscatedName("k") + int[][][] field1497; + @ObfuscatedName("d") + int[][][] field1502; + @ObfuscatedName("w") + int[] field1504; static { - field1474 = new float[2][8]; + field1500 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1467 = new int[2][2][4]; - this.field1476 = new int[2][2][4]; - this.field1469 = new int[2]; + this.field1497 = new int[2][2][4]; + this.field1502 = new int[2][2][4]; + this.field1504 = new int[2]; } - @ObfuscatedName("c") - float method2758(int var1, int var2, float var3) { - float var4 = (float)this.field1476[var1][0][var2] + var3 * (float)(this.field1476[var1][1][var2] - this.field1476[var1][0][var2]); + @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]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("o") - float method2770(int var1, int var2, float var3) { - float var4 = (float)this.field1467[var1][0][var2] + var3 * (float)(this.field1467[var1][1][var2] - this.field1467[var1][0][var2]); + @ObfuscatedName("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]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2; + var3 = (float)this.field1504[0] + (float)(this.field1504[1] - this.field1504[0]) * var2; var3 *= 0.0030517578F; - field1472 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1472 * 65536.0F); + field1505 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1505 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method2758(var1, 0, var2); - field1474[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, 0, var2)); - field1474[var1][1] = var3 * var3; + 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; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2758(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, var4, var2)); + var3 = this.method2805(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2803(var1, var4, var2)); float var6 = var3 * var3; - field1474[var1][var4 * 2 + 1] = field1474[var1][var4 * 2 - 1] * var6; - field1474[var1][var4 * 2] = field1474[var1][var4 * 2 - 1] * var5 + field1474[var1][var4 * 2 - 2] * var6; + 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; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1474[var1]; - var10000[var7] += field1474[var1][var7 - 1] * var5 + field1474[var1][var7 - 2] * var6; + var10000 = field1500[var1]; + var10000[var7] += field1500[var1][var7 - 1] * var5 + field1500[var1][var7 - 2] * var6; } - var10000 = field1474[var1]; - var10000[1] += field1474[var1][0] * var5 + var6; - var10000 = field1474[var1]; + var10000 = field1500[var1]; + var10000[1] += field1500[var1][0] * var5 + var6; + var10000 = field1500[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1474[0]; - var10000[var4] *= field1472; + var10000 = field1500[0]; + var10000[var4] *= field1505; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1474[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1500[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkp;Lds;)V" + signature = "(Lkb;Lde;)V" ) - final void method2769(Buffer var1, SoundEnvelope var2) { + final void method2813(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field1469[0] = var1.readUnsignedShort(); - this.field1469[1] = var1.readUnsignedShort(); + this.field1504[0] = var1.readUnsignedShort(); + this.field1504[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field1467[var5][0][var6] = var1.readUnsignedShort(); - this.field1476[var5][0][var6] = var1.readUnsignedShort(); + this.field1497[var5][0][var6] = var1.readUnsignedShort(); + this.field1502[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field1467[var5][1][var6] = var1.readUnsignedShort(); - this.field1476[var5][1][var6] = var1.readUnsignedShort(); + this.field1497[var5][1][var6] = var1.readUnsignedShort(); + this.field1502[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field1467[var5][1][var6] = this.field1467[var5][0][var6]; - this.field1476[var5][1][var6] = this.field1476[var5][0][var6]; + this.field1497[var5][1][var6] = this.field1497[var5][0][var6]; + this.field1502[var5][1][var6] = this.field1502[var5][0][var6]; } } } - if (var4 != 0 || this.field1469[1] != this.field1469[0]) { + if (var4 != 0 || this.field1504[1] != this.field1504[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field1469; - this.field1469[1] = 0; + int[] var7 = this.field1504; + this.field1504[1] = 0; var7[0] = 0; } } - @ObfuscatedName("t") + @ObfuscatedName("m") @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 fe2303fe50..f1d6f89e64 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("lb") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lki;" + signature = "Llk;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @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.field3729 = 0; + BZip2Decompressor_state.field3724 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Llk;)V" ) - static void method5836(BZip2State var0) { + static void method5838(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = WorldMapManager.BZip2Decompressor_block; - int var7 = var0.field3746; + int[] var6 = WorldMapData_0.BZip2Decompressor_block; + int var7 = var0.field3743; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3754 + 1; + int var12 = var0.field3761 + 1; label61: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3729; - var0.field3729 += var10 - var10; - if (var0.field3729 < var13) { + int var13 = var0.field3724; + var0.field3724 += var10 - var10; + if (var0.field3724 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - WorldMapManager.BZip2Decompressor_block = var6; - var0.field3746 = var7; + WorldMapData_0.BZip2Decompressor_block = var6; + var0.field3743 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Llk;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = 1410065408; - if (WorldMapManager.BZip2Decompressor_block == null) { - WorldMapManager.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; + var0.blockSize100k = 239779841; + if (WorldMapData_0.BZip2Decompressor_block == null) { + WorldMapData_0.BZip2Decompressor_block = new int[var0.blockSize100k * 818513568]; } boolean var26 = true; @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - WorldMapManager.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + WorldMapData_0.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) { - WorldMapManager.BZip2Decompressor_block[var47] = var1 & 255; + WorldMapData_0.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(WorldMapManager.BZip2Decompressor_block[var36] & 255); - var10000 = WorldMapManager.BZip2Decompressor_block; + var1 = (byte)(WorldMapData_0.BZip2Decompressor_block[var36] & 255); + var10000 = WorldMapData_0.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.field3746]; - var0.su_ch2 = (byte)(var0.field3746 & 255); - var0.field3746 >>= 8; + var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.field3743]; + var0.su_ch2 = (byte)(var0.field3743 & 255); + var0.field3743 >>= 8; ++var0.nblocks_used; - var0.field3754 = var47; - method5836(var0); - if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3761 = var47; + method5838(var0); + if (var0.field3761 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lki;)B" + signature = "(Llk;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lki;)B" + signature = "(Llk;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ILki;)I" + signature = "(ILlk;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Llk;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("l") + @ObfuscatedName("z") @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 563424da12..e89a00fdea 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,169 +2,165 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("lk") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("c") - final int field3736; - @ObfuscatedName("t") - final int field3718; - @ObfuscatedName("o") - final int field3748; - @ObfuscatedName("e") - final int field3720; - @ObfuscatedName("i") - final int field3717; - @ObfuscatedName("g") - final int field3722; + @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("q") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -807035473 + intValue = -1520658841 ) @Export("nextByte") int nextByte; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1509070377 + intValue = 1705468259 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -902711531 + intValue = -530026491 ) @Export("next_out") int next_out; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1633057799 + intValue = 1793031375 ) @Export("outputLength") int outputLength; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 135980565 - ) - int field3729; @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 828020907 + ) + int field3724; + @ObfuscatedName("u") @Export("out_char") byte out_char; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1481212591 + intValue = -1550283393 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -29854091 + intValue = 2097262377 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -725667235 + intValue = -1241583147 ) @Export("bsLive") int bsLive; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1401293824 - ) + @ObfuscatedName("a") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2006117845 + intValue = 1768899761 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1496152105 + intValue = -2111080359 ) - int field3746; - @ObfuscatedName("f") + int field3743; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2017789723 + intValue = -125465233 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("unzftab") int[] unzftab; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2065710979 + intValue = 1422716731 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("cftab") int[] cftab; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -402806649 + intValue = 1484476187 ) @Export("nInUse") int nInUse; @ObfuscatedName("ae") @Export("inUse") boolean[] inUse; - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("ll8") byte[] ll8; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("selector") byte[] selector; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("limit") int[][] limit; @ObfuscatedName("as") @Export("base") int[][] base; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("perm") int[][] perm; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("minLens") int[] minLens; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1642554811 + intValue = -453266259 ) - int field3754; + int field3761; BZip2State() { - this.field3736 = 4096; - this.field3718 = 16; - this.field3748 = 258; - this.field3720 = 6; - this.field3717 = 50; - this.field3722 = 18002; + this.field3756 = 4096; + this.field3725 = 16; + this.field3726 = 258; + this.field3729 = 6; + this.field3750 = 50; + this.field3737 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -182,17 +178,4 @@ public final class BZip2State { this.perm = new int[6][258]; this.minLens = new int[6]; } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)V", - garbageValue = "84" - ) - static final void method5833(String var0, int var1) { - PacketBufferNode var2 = TilePaint.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.method5603(var1); - Client.packetWriter.addNode(var2); - } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 2e8141797d..85ce4992fa 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -3,61 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eu") +@ObfuscatedName("ep") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -432640287 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -970419585 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1222089633 + intValue = 2013637089 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 778552875 + intValue = 1191949217 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -935099037 + ) + @Export("x") + int x; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2050214703 ) @Export("orientationA") int orientationA; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -829648765 + intValue = -1637656997 ) @Export("orientationB") int orientationB; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 515248560912133581L + longValue = 8712969699368096229L ) @Export("tag") public long tag; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1262947559 + intValue = 1289122601 ) @Export("flags") int flags; @@ -67,44 +68,356 @@ public final class BoundaryObject { this.flags = 0; } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2085601803" + signature = "(IIII)Lce;", + garbageValue = "-719728055" ) - public static void method3333() { - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field406 = KeyHandler.field408; - KeyHandler.field405 = 0; - int var1; - if (KeyHandler.field387 < 0) { - for (var1 = 0; var1 < 112; ++var1) { - KeyHandler.KeyHandler_pressedKeys[var1] = false; - } - - KeyHandler.field387 = KeyHandler.field400; + @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 { - while (KeyHandler.field387 != KeyHandler.field400) { - var1 = KeyHandler.field399[KeyHandler.field400]; - KeyHandler.field400 = KeyHandler.field400 + 1 & 127; - if (var1 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var1] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field405 < KeyHandler.field404.length - 1) { - KeyHandler.field404[++KeyHandler.field405 - 1] = var1; + label56: { + byte[] var9 = class41.archive12.takeFileFlat(var8); + if (var9 != null) { + if (var9.length <= 1) { + var5 = null; + break label56; } - KeyHandler.KeyHandler_pressedKeys[var1] = true; + 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; } } - if (KeyHandler.field405 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; + return var13 != null ? var13 : null; + } + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-522510299" + ) + 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; } - KeyHandler.field408 = KeyHandler.field407; + 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 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; + } + + 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; + } + + 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()); + } + } + + 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()); + } + } + + 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 = ""; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } } } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 9ceb761803..c31b0dca3b 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -1,39 +1,33 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -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("ll") +@ObfuscatedName("ld") @Implements("Bounds") public class Bounds { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -743788715 - ) - @Export("lowX") - public int lowX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 390143547 + intValue = 1060370967 ) @Export("lowY") public int lowY; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1967964901 + intValue = 1597072337 + ) + @Export("lowX") + public int lowX; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -456113605 ) @Export("highX") public int highX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1178395907 + intValue = -239139767 ) @Export("highY") public int highY; @@ -47,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2024948285" + garbageValue = "1269806188" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -58,10 +52,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-30" + signature = "(III)V", + garbageValue = "838675503" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -69,31 +63,31 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lll;Lll;I)V", - garbageValue = "-782590696" + signature = "(Lld;Lld;B)V", + garbageValue = "-7" ) - public void method6031(Bounds var1, Bounds var2) { - this.method6032(var1, var2); - this.method6033(var1, var2); + public void method6047(Bounds var1, Bounds var2) { + this.method6051(var1, var2); + this.method6052(var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lll;Lll;I)V", - garbageValue = "-997217284" + signature = "(Lld;Lld;I)V", + garbageValue = "-1938755982" ) - void method6032(Bounds var1, Bounds var2) { + void method6051(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX -= var1.lowX - this.lowX; + var2.highX = (var2.highX * -2075179277 - (var1.lowX * -2075179277 - this.lowX * -2075179277)) * -456113605; var2.lowX = var1.lowX; } - if (var2.method6034() > var1.method6034()) { - var2.highX -= var2.method6034() - var1.method6034(); + if (var2.method6053() > var1.method6053()) { + var2.highX -= var2.method6053() - var1.method6053(); } if (var2.highX < 0) { @@ -102,21 +96,21 @@ public class Bounds { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lll;Lll;I)V", - garbageValue = "1896853998" + signature = "(Lld;Lld;I)V", + garbageValue = "-642069303" ) - void method6033(Bounds var1, Bounds var2) { + void method6052(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY -= var1.lowY - this.lowY; + var2.highY = (var2.highY * -707514887 - (var1.lowY * -707514887 - this.lowY * -707514887)) * -239139767; var2.lowY = var1.lowY; } - if (var2.method6035() > var1.method6035()) { - var2.highY -= var2.method6035() - var1.method6035(); + if (var2.method6050() > var1.method6050()) { + var2.highY -= var2.method6050() - var1.method6050(); } if (var2.highY < 0) { @@ -125,87 +119,25 @@ public class Bounds { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1353685285" + signature = "(B)I", + garbageValue = "0" ) - int method6034() { + int method6053() { return this.lowX + this.highX; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-155482088" + garbageValue = "180335993" ) - int method6035() { + int method6050() { return this.highY + this.lowY; } public String toString() { return null; } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "1378927694" - ) - static String method6058(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 + ' '; - } - } - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "(Ljava/net/Socket;IIB)Lkr;", - garbageValue = "-41" - ) - public static AbstractSocket method6040(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); - } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index abae376e4e..8f300abef6 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("je") +@ObfuscatedName("ke") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1462953665 + intValue = 1726409249 ) @Export("world") public int world; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 179134735 + intValue = 1414783729 ) @Export("int2") public int int2; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1349530221 + intValue = -25627413 ) @Export("rank") public int rank; @@ -30,10 +30,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1991575010" + garbageValue = "1769610141" ) @Export("set") void set(int var1, int var2) { @@ -41,49 +41,23 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("ab") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1822334974" + garbageValue = "734760061" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("ap") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-101" + signature = "(I)Z", + garbageValue = "-182915585" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "631809601" - ) - public static int method5234(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } - - return var2; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-2002208158" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 7086d2fffb..229ecf030f 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,24 +1,12 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fg") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lhq;" - ) - static ServerBuild field1987; - @ObfuscatedName("dr") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -26,10 +14,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "552186656" + signature = "(Lke;Lke;I)I", + garbageValue = "258923483" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -44,112 +32,12 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("c") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I[BLky;B)V", - garbageValue = "-1" + signature = "(B)V", + garbageValue = "16" ) - static void method3507(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.field3150 == 0) { - class218.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class218.ArchiveDiskActionHandler_thread.setDaemon(true); - class218.ArchiveDiskActionHandler_thread.start(); - class218.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3150 = 600; - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-837089812" - ) - static void method3505(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "0" - ) - public static boolean method3510(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { - return true; - } else { - if (var0 != 0) { - char[] var1 = class288.cp1252AsciiExtension; - - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - } - - return false; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lia;IIIBZI)V", - garbageValue = "-1197984265" - ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; - } - - } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; - } - } - - var8 = new NetFileRequest(); - var8.archive = var0; - var8.crc = var3; - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - ++NetCache.NetCache_pendingPriorityWritesCount; - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); - NetCache.NetCache_pendingWrites.put(var8, var6); - ++NetCache.NetCache_pendingWritesCount; - } - - } - } - } + public static void method3533() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index d49272f797..88d72c05d7 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -1,25 +1,27 @@ +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("kp") +@ObfuscatedName("kb") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("array") public byte[] array; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1466465553 + intValue = 77261851 ) @Export("offset") public int offset; @@ -48,7 +50,7 @@ public class Buffer extends Node { long var4 = (long)var2; for (int var3 = 0; var3 < 8; ++var3) { - if (1L == (var4 & 1L)) { + if ((var4 & 1L) == 1L) { var4 = var4 >>> 1 ^ -3932672073523589310L; } else { var4 >>>= 1; @@ -61,7 +63,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = GrandExchangeOfferTotalQuantityComparator.ByteArrayPool_getArray(var1); + this.array = class182.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +72,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-597466859" + signature = "(B)V", + garbageValue = "1" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - class267.ByteArrayPool_release(this.array); + class51.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1142768671" + garbageValue = "1258821856" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("at") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "774845024" + signature = "(IB)V", + garbageValue = "-77" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +107,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1983251437" + garbageValue = "794369714" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -119,8 +121,8 @@ public class Buffer extends Node { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "14678" + signature = "(II)V", + garbageValue = "747474969" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +132,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ai") + @ObfuscatedName("aw") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -141,7 +143,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("ab") + @ObfuscatedName("bf") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -154,20 +156,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("ap") + @ObfuscatedName("bc") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "1178283673" + garbageValue = "-1864827002" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bq") + @ObfuscatedName("bd") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-562863668" + garbageValue = "1695463658" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,15 +177,15 @@ public class Buffer extends Node { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += Tiles.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class90.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bc") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-18" + signature = "(Ljava/lang/String;S)V", + garbageValue = "21883" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,15 +194,15 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += Tiles.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class90.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bk") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;S)V", - garbageValue = "139" + signature = "(Ljava/lang/CharSequence;I)V", + garbageValue = "-1160654316" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { @@ -220,13 +222,13 @@ public class Buffer extends Node { this.array[++this.offset - 1] = 0; this.writeVarInt(var4); - this.offset += WorldMapIcon_1.method310(this.array, this.offset, var1); + this.offset += Entity.method3372(this.array, this.offset, var1); } - @ObfuscatedName("bb") + @ObfuscatedName("bg") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1019958265" + garbageValue = "-1590891251" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -236,10 +238,19 @@ public class Buffer extends Node { } - @ObfuscatedName("bi") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "6" + signature = "(Lkb;I)V", + garbageValue = "-1161644525" + ) + public void method5789(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-788698367" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -253,10 +264,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bp") + @ObfuscatedName("br") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-14085" + signature = "(II)V", + garbageValue = "733201281" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -268,10 +279,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bl") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-739300213" + garbageValue = "-1675640684" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -282,10 +293,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("by") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1285300574" + signature = "(IB)V", + garbageValue = "-13" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -298,10 +309,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1255643673" + garbageValue = "-2128339921" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -324,30 +335,30 @@ public class Buffer extends Node { this.writeByte(var1 & 127); } - @ObfuscatedName("bw") + @ObfuscatedName("bx") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-7" + garbageValue = "53" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("bt") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(B)B", - garbageValue = "90" + signature = "(I)B", + garbageValue = "-1603028719" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("bn") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1290925283" + signature = "(B)I", + garbageValue = "109" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -355,10 +366,10 @@ public class Buffer extends Node { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bm") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1932495481" + garbageValue = "1835771986" ) @Export("readShort") public int readShort() { @@ -371,10 +382,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-17" + signature = "(S)I", + garbageValue = "3112" ) @Export("readMedium") public int readMedium() { @@ -382,10 +393,10 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bd") + @ObfuscatedName("bb") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1209977249" + garbageValue = "297718403" ) @Export("readInt") public int readInt() { @@ -393,32 +404,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("bs") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "-1589308129" + signature = "(B)J", + garbageValue = "106" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return var3 + (var1 << 32); + return (var1 << 32) + var3; } - @ObfuscatedName("bx") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1547974327" + signature = "(B)Z", + garbageValue = "25" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bh") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "510750130" + signature = "(B)Ljava/lang/String;", + garbageValue = "44" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -430,10 +441,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bg") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "46" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1564619990" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -443,13 +454,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : ScriptFrame.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : WorldMapArea.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-1698785441" + garbageValue = "-1416358410" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -463,14 +474,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : ScriptFrame.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : WorldMapArea.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("bj") + @ObfuscatedName("bw") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-1344056693" + garbageValue = "-902492653" ) @Export("readCESU8") public String readCESU8() { @@ -540,10 +551,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bu") + @ObfuscatedName("cw") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "1664358165" + garbageValue = "-1176132955" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -553,10 +564,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bv") + @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "91" + signature = "(I)I", + garbageValue = "1517353363" ) @Export("readShortSmart") public int readShortSmart() { @@ -564,10 +575,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("bo") + @ObfuscatedName("ch") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1358328667" + garbageValue = "1283642471" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -575,10 +586,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("br") + @ObfuscatedName("cr") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-403922272" + garbageValue = "-1839551709" ) public int method5589() { int var1 = 0; @@ -592,21 +603,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1291286864" + garbageValue = "1537726341" ) - public int method5592() { + public int method5778() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("cg") + @ObfuscatedName("co") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-292040841" + signature = "(B)I", + garbageValue = "-73" ) - public int method5593() { + public int method5591() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -615,10 +626,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cr") + @ObfuscatedName("cm") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "8212" + signature = "(I)I", + garbageValue = "-1771949174" ) @Export("readVarInt") public int readVarInt() { @@ -632,10 +643,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("co") + @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "([II)V", - garbageValue = "-537752227" + signature = "([IS)V", + garbageValue = "280" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -660,10 +671,10 @@ public class Buffer extends Node { } - @ObfuscatedName("ck") + @ObfuscatedName("cs") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "1804216479" + garbageValue = "613143765" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -688,10 +699,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cn") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "([IIII)V", - garbageValue = "-996526145" + signature = "([IIIB)V", + garbageValue = "37" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -721,7 +732,7 @@ public class Buffer extends Node { @ObfuscatedName("cd") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "571658661" + garbageValue = "-189170169" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -748,10 +759,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("ct") + @ObfuscatedName("cx") @ObfuscatedSignature( signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-573569377" + garbageValue = "-1668495798" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -767,10 +778,10 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1621128652" + garbageValue = "-176240895" ) @Export("writeCrc") public int writeCrc(int var1) { @@ -787,10 +798,10 @@ public class Buffer extends Node { return var5; } - @ObfuscatedName("cf") + @ObfuscatedName("ci") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1877134209" + garbageValue = "-284855787" ) @Export("checkCrc") public boolean checkCrc() { @@ -806,115 +817,114 @@ public class Buffer extends Node { var4 = ~var4; var5 = this.readInt(); - return var4 == var5; - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-579952259" - ) - public void method5602(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); + return var5 == var4; } @ObfuscatedName("cz") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1753597571" + garbageValue = "-927080333" ) - public void method5603(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); + public void method5727(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("cu") + @ObfuscatedName("cb") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "9" + garbageValue = "51" ) - public void method5604(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); + public void method5724(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); } @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(IB)V", + garbageValue = "16" ) - public int method5605() { + 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("ce") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-534230920" + garbageValue = "91963828" ) - public int method5606() { + public int method5604() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2078777161" - ) - public int method5771() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "(B)B", - garbageValue = "-58" - ) - public byte method5618() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "1756539900" - ) - public byte method5609() { - return (byte)(0 - this.array[++this.offset - 1]); - } - @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "1575706022" + signature = "(I)I", + garbageValue = "-576195763" ) - public byte method5780() { + 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("cc") + @ObfuscatedName("ce") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1143249456" + garbageValue = "70039705" ) - @Export("writeShortLE") - public void writeShortLE(int var1) { + public void method5609(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("ch") + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-240350169" + garbageValue = "-2077130267" ) - public void method5787(int var1) { + public void method5610(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("cx") + @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "73" + signature = "(II)V", + garbageValue = "1323815181" ) @Export("writeIntME") public void writeIntME(int var1) { @@ -922,44 +932,44 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("cl") + @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1821746850" + signature = "(B)I", + garbageValue = "45" ) - public int method5614() { + public int method5564() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("cs") + @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1470404124" + signature = "(B)I", + garbageValue = "127" ) - public int method5762() { + public int method5613() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("cj") + @ObfuscatedName("du") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1025515920" + garbageValue = "438416270" ) - public int method5740() { + public int method5614() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("cv") + @ObfuscatedName("dz") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1559852644" + garbageValue = "-1103250346" ) - public int method5610() { + public int method5743() { this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { var1 -= 65536; } @@ -967,105 +977,137 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dm") + @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1775390343" + signature = "(II)V", + garbageValue = "717013158" ) - public int method5722() { - this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; - } - - @ObfuscatedName("dw") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "3" - ) - public void method5619(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); + public void method5616(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); } - @ObfuscatedName("ds") + @ObfuscatedName("dq") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1418078449" + signature = "(II)V", + garbageValue = "899177075" ) - public int method5620() { - this.offset += 3; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); + public void method5617(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") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1411725545" + ) + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); } @ObfuscatedName("dl") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2033639615" + garbageValue = "-598231963" ) - public void method5624(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("dv") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "33" - ) - public void method5622(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("do") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2048648417" - ) - public void method5623(int var1) { + public void method5644(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("di") + @ObfuscatedName("dm") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1385775072" + garbageValue = "123221290" ) - public int method5665() { + public int method5619() { this.offset += 4; return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); } - @ObfuscatedName("dc") + @ObfuscatedName("db") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-96808350" + garbageValue = "-1049580829" ) - public int method5625() { + public int method5638() { 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("dj") + @ObfuscatedName("dw") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1174485250" + signature = "(B)I", + garbageValue = "76" ) - public int method5626() { + public int method5621() { 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") + @ObfuscatedSignature( + signature = "([BIIB)V", + garbageValue = "69" + ) + public void method5622(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= 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; + + 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; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } + } 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 8150c318ad..04bfb91db9 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("me") +@ObfuscatedName("ms") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmb;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -8444963977777256649L + longValue = -6621394340155458391L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 322598023 + intValue = -498492055 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 2521859524399949401L + longValue = -915874801967299919L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -477832747 + intValue = 730352763 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 8179397345785106237L + longValue = 8841745747932636313L ) @Export("offset") long offset; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 3198798508515629197L + longValue = -5167130975185536305L ) @Export("fileLength") long fileLength; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 4935958229854898805L + longValue = -2996772461190095265L ) @Export("length") long length; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 647147803493944647L + longValue = -2630268660887985841L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lmx;II)V" + signature = "(Lmb;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("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1756613502" + garbageValue = "-859079735" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +105,30 @@ public class BufferedFile { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)J", - garbageValue = "-80" + garbageValue = "65" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "-1589882877" + garbageValue = "1780472721" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "22" + signature = "([BIII)V", + garbageValue = "1941673100" ) @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 && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -200,16 +200,16 @@ public class BufferedFile { long var13 = -1L; long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { var13 = var4; } if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { - var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { - var10 = (long)var7 + var4; + var10 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { + var10 = var4 + (long)var7; } if (var13 > -1L && var10 > var13) { @@ -231,15 +231,15 @@ public class BufferedFile { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1700584004" + garbageValue = "-2013306645" ) @Export("load") void load() throws IOException { this.readBufferLength = 0; - if (this.fileOffset != this.offset) { + if (this.offset != this.fileOffset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -261,10 +261,10 @@ public class BufferedFile { } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-1609695177" + signature = "([BIIB)V", + garbageValue = "-1" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -273,11 +273,11 @@ public class BufferedFile { this.length = this.offset + (long)var3; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -314,16 +314,16 @@ public class BufferedFile { long var9 = -1L; long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var9 = this.offset; - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = this.offset + (long)var3; + 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 = this.readBufferOffset + (long)this.readBufferLength; + var6 = (long)this.readBufferLength + this.readBufferOffset; } if (var9 > -1L && var6 > var9) { @@ -339,37 +339,37 @@ public class BufferedFile { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "118" + signature = "(I)V", + garbageValue = "-985506123" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { - if (this.writeBufferOffset != this.fileOffset) { + if (-1L != this.writeBufferOffset) { + if (this.fileOffset != this.writeBufferOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)(this.writeBufferLength * -2104387715) * -477832747L; + this.fileOffset += (long)this.writeBufferLength * 257304554331176961L; if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } long var1 = -1L; long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { var1 = this.writeBufferOffset; } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { var1 = this.readBufferOffset; } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { - var3 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)this.writeBufferLength + this.writeBufferOffset > 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; } if (var1 > -1L && var3 > var1) { diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 9299816f3b..62fff0e91e 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,21 +5,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kw") +@ObfuscatedName("lc") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("socket") Socket socket; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Llm;" ) @Export("source") BufferedSource source; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Llo;" ) @Export("sink") BufferedSink sink; @@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-259367480" + signature = "(B)V", + garbageValue = "7" ) @Export("close") public void close() { @@ -51,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-108" + signature = "(I)I", + garbageValue = "1436175029" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2004103994" + garbageValue = "195119972" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-624446357" + signature = "(IB)Z", + garbageValue = "0" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1847434030" + signature = "([BIIB)I", + garbageValue = "33" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "977025272" + garbageValue = "-2040746201" ) @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 6eb1c56016..b5cedba1d7 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("kv") +@ObfuscatedName("lo") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("thread") Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2050676869 + intValue = -63285245 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("buffer") byte[] buffer; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1109896429 + intValue = 238793019 ) @Export("position") int position; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1699191965 + intValue = 1710004877 ) @Export("limit") int limit; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("exception") IOException exception; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-96" + garbageValue = "86" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "0" + signature = "([BIIS)V", + garbageValue = "-5417" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1954153796" + garbageValue = "1845686279" ) @Export("close") void close() { @@ -197,142 +197,4 @@ public class BufferedSink implements Runnable { } while(!this.isClosed()); } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(DDIB)[D", - garbageValue = "80" - ) - public static double[] method5902(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] = ViewportMouse.method3061((double)var7, var0, var2); - ++var7; - } - - return var6; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "([BIIB)Z", - garbageValue = "0" - ) - static final boolean method5913(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; - - label68: - while (true) { - int var6 = var4.method5589(); - 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 label68; - } - - 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 = Occluder.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field700; - var3 = false; - } - - var8 = true; - } - } - } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); - } - } - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-529911776" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field881) { - class197.midiPcmStream.clear(); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field881) { - TaskHandler.playMusicTrack(2, MouseHandler.archive6, var0, 0, Client.musicVolume, false); - } - - Client.currentTrackGroupId = var0; - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - signature = "(Lhn;I)Z", - garbageValue = "-2086851217" - ) - static final boolean method5915(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.method4066(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = TilePaint.getPacketBufferNode(ClientPacket.field2284, 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/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index b67b62482a..cb28ba44ed 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("kk") +@ObfuscatedName("lm") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("thread") Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 276934727 + intValue = 1277158721 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("buffer") byte[] buffer; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1985873745 + intValue = -555617543 ) @Export("position") int position; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 738500389 + intValue = 155508897 ) @Export("limit") int limit; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "89" + garbageValue = "-72" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-956188768" + signature = "(B)I", + garbageValue = "23" ) @Export("available") int available() throws IOException { @@ -110,7 +110,7 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", garbageValue = "0" @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-2106245122" + garbageValue = "1983189445" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2102342981" + garbageValue = "-424049486" ) @Export("close") void close() { @@ -243,36 +243,4 @@ public class BufferedSource implements Runnable { } } } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "114" - ) - static void method5934() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (ScriptFrame.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = WorldMapLabel.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 = Varps.getWidget(var4); - if (var5 != null) { - NPCDefinition.invalidateWidget(var5); - } - } - } - } - - } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index c698663666..4c94bfc0c6 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("fd") +@ObfuscatedName("gu") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 058c300718..aa194bb3ab 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kl") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1009050051 + intValue = 1085221259 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2126667647 + intValue = -1727061429 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -82871939 + intValue = 13537333 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("d") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("j") + @ObfuscatedName("z") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("t") @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; + public static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("kv") + @ObfuscatedSignature( + signature = "Lbi;" + ) + @Export("localPlayer") + static Player localPlayer; static { ByteArrayPool_smallCount = 0; @@ -50,10 +56,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IZI)[B", - garbageValue = "103093333" + garbageValue = "1813888671" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -86,13 +92,13 @@ public class ByteArrayPool { } if (ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if (ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < ByteArrayPool_alternativeSizes[var4]) { + for (int var4 = 0; var4 < RunException.ByteArrayPool_alternativeSizes.length; ++var4) { + if (RunException.ByteArrayPool_alternativeSizes[var4] != var0) { + if (var0 < RunException.ByteArrayPool_alternativeSizes[var4]) { } - } else if (VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = ByteArrayPool_arrays[var4][--VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]]; - ByteArrayPool_arrays[var4][VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]]; + ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index c297c926cf..293b50e0c2 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,27 +1,22 @@ +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("gz") +@ObfuscatedName("hq") @Implements("Calendar") public class Calendar { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("MONTH_NAMES_ENGLISH_GERMAN") - static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("t") - @Export("DAYS_OF_THE_WEEK") - static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("o") - @Export("Calendar_calendar") - static java.util.Calendar Calendar_calendar; + public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; + @Export("DAYS_OF_THE_WEEK") + public static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("k") + @Export("Calendar_calendar") + public static java.util.Calendar Calendar_calendar; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; @@ -30,12 +25,68 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1040616662" + signature = "(II)I", + garbageValue = "-1975590317" ) - static final void method4014(String var0) { - class60.method1188("Please remove " + var0 + " from your ignore list first"); + 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.field1205) { + 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.field1205 = false; + } } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 3686aa1ad8..ee9e79e00d 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -5,16 +5,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("bu") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("c") + @ObfuscatedName("m") @Export("component") Component component; @@ -22,45 +16,39 @@ public final class Canvas extends java.awt.Canvas { this.component = var1; } - public final void paint(Graphics var1) { - this.component.paint(var1); - } - public final void update(Graphics var1) { this.component.update(var1); } - @ObfuscatedName("fq") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-97" - ) - static final void method861() { - if (FileSystem.ClanChat_inClanChat) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.sort(); - } - - DefaultsGroup.method5953(); - FileSystem.ClanChat_inClanChat = false; - } - + public final void paint(Graphics var1) { + this.component.paint(var1); } - @ObfuscatedName("hf") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-77" + signature = "(IS)I", + garbageValue = "-1870" ) - static int method864(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; - } + public static int method958(int var0) { + return var0 >> 17 & 7; + } - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(IIIS)I", + garbageValue = "-22602" + ) + 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); } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 1d4be05597..26f5f89d4e 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,25 +4,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cl") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("i") + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = -899235317 + longValue = -181918079142719425L ) - public static int field1289; - @ObfuscatedName("k") - public static String[] field1291; - @ObfuscatedName("t") + static long field1319; + @ObfuscatedName("go") @ObfuscatedSignature( - signature = "[Lbn;" + signature = "Lla;" + ) + @Export("compass") + static Sprite compass; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "[Lby;" ) @Export("messages") Message[] messages; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2026360781 + intValue = 1013484149 ) @Export("count") int count; @@ -31,10 +35,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbn;", - garbageValue = "0" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lby;", + garbageValue = "922420852" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -62,140 +66,111 @@ public class ChatChannel { return var5; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lbn;", - garbageValue = "187354939" + signature = "(IB)Lby;", + garbageValue = "49" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "40" + signature = "(I)I", + garbageValue = "-2095560133" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("hj") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "-1620265194" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-570972962" ) - static final void method2302(int var0, int var1, boolean var2) { - if (!var2 || var0 != SecureRandomCallable.field530 || Language.field2359 != var1) { - SecureRandomCallable.field530 = var0; - Language.field2359 = var1; - Projectile.updateGameState(25); - class197.drawLoadingMessage("Loading - please wait.", true); - int var3 = Messages.baseX * 64; - int var4 = Language.baseY * 64; - Messages.baseX = (var0 - 6) * 8; - Language.baseY = (var1 - 6) * 8; - int var5 = Messages.baseX * 64 - var3; - int var6 = Language.baseY * 64 - var4; - var3 = Messages.baseX * 64; - var4 = Language.baseY * 64; - - 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; - HitSplatDefinition.cameraX -= var5 << 7; - Actor.cameraZ -= var6 << 7; - PendingSpawn.oculusOrbFocalPointX -= var5 << 7; - Skeleton.oculusOrbFocalPointY -= var6 << 7; - Client.field704 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - + @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(class49.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 924bfea967..138f7011ec 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,164 +4,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("ko") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Lkt;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("name") public String name; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("owner") public String owner; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("minKick") public byte minKick; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1887951893 + intValue = 1347537209 ) @Export("rank") public int rank; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 404560335 + intValue = 2146085943 ) - int field3628; + int field3634; @ObfuscatedSignature( - signature = "(Lmv;Ljh;)V" + signature = "(Lmx;Lkt;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3628 = 1; + this.field3634 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)Ljk;", - garbageValue = "30683" + signature = "(I)Ljd;", + garbageValue = "-1332552421" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)[Ljk;", - garbageValue = "19" + signature = "(II)[Ljd;", + garbageValue = "-667029686" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "-26" + garbageValue = "105" ) @Export("readName") final void readName(String var1) { - String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1)); - if (var3 == null) { - var3 = ""; - } - - this.name = var3; + this.name = DevicePcmPlayerProvider.method948(var1); } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-11" + signature = "(Ljava/lang/String;I)V", + garbageValue = "2103961051" ) @Export("setOwner") final void setOwner(String var1) { - String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1)); - if (var3 == null) { - var3 = ""; - } - - this.owner = var3; + this.owner = DevicePcmPlayerProvider.method948(var1); } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-866668156" + signature = "(Lkb;I)V", + garbageValue = "1675969989" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - long var5 = var2; - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { - if (0L == var2 % 37L) { - var4 = null; - } else { - var7 = 0; - - for (long var13 = var2; var13 != 0L; var13 /= 37L) { - ++var7; - } - - StringBuilder var15 = new StringBuilder(var7); - - while (0L != var5) { - long var11 = var5; - var5 /= 37L; - var15.append(class289.base37Table[(int)(var11 - var5 * 37L)]); - } - - var4 = var15.reverse().toString(); - } - } else { - var4 = null; - } - - this.readName(var4); + this.readName(GameObject.method3405(var2)); this.minKick = var1.readByte(); - var7 = var1.readUnsignedByte(); - if (var7 != 255) { + int var4 = var1.readUnsignedByte(); + if (var4 != 255) { this.clear(); - for (int var8 = 0; var8 < var7; ++var8) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.readUnsignedShort(); - var9.set(var10, ++this.field3628 - 1); - var9.rank = var1.readByte(); + for (int var5 = 0; var5 < var4; ++var5) { + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var7 = var1.readUnsignedShort(); + var6.set(var7, ++this.field3634 - 1); + var6.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var9); + this.isLocalPlayer(var6); } } } - @ObfuscatedName("p") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "1239861248" + signature = "(Lkb;I)V", + garbageValue = "-1155305071" ) - public final void method5296(Buffer var1) { + public final void method5301(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -191,17 +154,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3628 - 1); + var6.set(var3, ++this.field3634 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("h") + @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "58" + signature = "(I)V", + garbageValue = "1797514283" ) @Export("clearFriends") public final void clearFriends() { @@ -211,10 +174,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cb") + @ObfuscatedName("cp") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-275876635" + garbageValue = "1089464789" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -224,10 +187,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cf") + @ObfuscatedName("ck") @ObfuscatedSignature( signature = "(Ljt;I)V", - garbageValue = "1790054092" + garbageValue = "-66701208" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -237,48 +200,28 @@ public class ClanChat extends UserList { } - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lhn;I[B[BI)V", - garbageValue = "1586924151" + signature = "(I)Ljava/lang/String;", + garbageValue = "1033875086" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2702 == null) { - if (var2 == null) { - return; + static String method5318() { + String var0; + if (GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername) { + String var2 = Login.Login_username; + int var4 = var2.length(); + char[] var5 = new char[var4]; + + for (int var6 = 0; var6 < var4; ++var6) { + var5[var6] = '*'; } - var0.field2702 = new byte[11][]; - var0.field2648 = new byte[11][]; - var0.field2649 = new int[11]; - var0.field2560 = new int[11]; - } - - var0.field2702[var1] = var2; - if (var2 != null) { - var0.field2646 = true; + String var3 = new String(var5); + var0 = var3; } else { - var0.field2646 = false; - - for (int var4 = 0; var4 < var0.field2702.length; ++var4) { - if (var0.field2702[var4] != null) { - var0.field2646 = true; - break; - } - } + var0 = Login.Login_username; } - var0.field2648[var1] = var3; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "520942545" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + return var0; } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 5ae704c244..55d44100ac 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -6,15 +6,15 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jt") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("friend") TriBool friend; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-526388551" + garbageValue = "93359593" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2130139941" + garbageValue = "416982136" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2012869833" + garbageValue = "-559295927" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = KeyHandler.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = Projectile.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1620040890" + garbageValue = "-203044757" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-84" + signature = "(I)Z", + garbageValue = "-2013472471" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,74 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-749177789" + signature = "(S)V", + garbageValue = "1528" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = KeyHandler.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "-1733263063" - ) - static boolean method5073(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - return false; - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - return false; - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - return false; - } - - var5 = var9; - var4 = true; - } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); - } + this.ignored = Projectile.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 b4487ff86a..d73dc00ecf 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -16,1279 +16,1282 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("mg") + @ObfuscatedName("nc") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhe;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("oh") + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = -2146709593 + intValue = -1534976767 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("of") + @ObfuscatedName("oo") @ObfuscatedGetter( - intValue = -1865852327 + intValue = -1032308699 ) - static int field850; + static int field884; @ObfuscatedName("od") @ObfuscatedGetter( - longValue = 3639588590521619509L + longValue = 7541257458804320211L ) - static long field859; - @ObfuscatedName("qa") - static boolean field881; + 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") - static boolean[] field851; - @ObfuscatedName("oo") - static boolean[] field853; - @ObfuscatedName("ni") - static boolean field827; - @ObfuscatedName("oc") - static boolean[] field852; - @ObfuscatedName("nd") - static boolean field824; - @ObfuscatedName("nh") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("nv") @ObfuscatedGetter( - intValue = 1483646797 + intValue = 777988173 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("oz") - @Export("isResizable") - static boolean isResizable; - @ObfuscatedName("nu") + @ObfuscatedName("su") @ObfuscatedGetter( - intValue = 1169531803 + intValue = 2073816179 ) - static int field839; - @ObfuscatedName("sa") + public static int field891; + @ObfuscatedName("oe") @ObfuscatedGetter( - intValue = 1909140369 + intValue = -2140267163 ) - public static int field888; - @ObfuscatedName("mi") + static int field873; + @ObfuscatedName("ns") + static boolean field732; + @ObfuscatedName("qn") + static boolean field915; + @ObfuscatedName("np") @ObfuscatedGetter( - intValue = 1522690023 + intValue = 1891755493 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("mr") + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = 708609409 + intValue = -1161612029 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nz") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 1648334173 + intValue = 1561528451 ) - static int field919; - @ObfuscatedName("mw") + static int field859; + @ObfuscatedName("og") @ObfuscatedSignature( - signature = "Lhn;" - ) - @Export("clickedWidgetParent") - static Widget clickedWidgetParent; - @ObfuscatedName("on") - @ObfuscatedGetter( - intValue = 1447905711 - ) - @Export("gameDrawingMode") - static int gameDrawingMode; - @ObfuscatedName("nf") - @ObfuscatedGetter( - intValue = -393886603 - ) - static int field826; - @ObfuscatedName("oi") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("oj") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("mq") - @ObfuscatedSignature( - signature = "Lhn;" - ) - @Export("viewportWidget") - static Widget viewportWidget; - @ObfuscatedName("os") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = -1785096625 - ) - @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("ox") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("tc") - @ObfuscatedSignature( - signature = "Lbm;" - ) - static final class65 field809; - @ObfuscatedName("oq") - @ObfuscatedGetter( - intValue = 1929690709 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("oe") - @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("widgetClickMasks") static NodeHashTable widgetClickMasks; - @ObfuscatedName("nw") - @ObfuscatedGetter( - intValue = 1341246229 - ) - static int field864; - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = 1361957455 - ) - static int field829; - @ObfuscatedName("ot") + @ObfuscatedName("ng") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Lhe;" + ) + @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") + @ObfuscatedSignature( + signature = "Lhe;" + ) + @Export("viewportWidget") + static Widget viewportWidget; + @ObfuscatedName("oy") + @ObfuscatedGetter( + intValue = 881881039 + ) + @Export("gameDrawingMode") + static int gameDrawingMode; + @ObfuscatedName("oc") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = 1604597695 + ) + @Export("staffModLevel") + static int staffModLevel; + @ObfuscatedName("ob") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("tp") + @ObfuscatedSignature( + signature = "Lbj;" + ) + static final class74 field954; + @ObfuscatedName("ow") + @ObfuscatedSignature( + signature = "Ljh;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("px") + @ObfuscatedName("nt") @ObfuscatedGetter( - intValue = 1776210233 + intValue = 1322546357 ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("pl") + static int field834; + @ObfuscatedName("ri") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("rq") + static boolean[] field926; + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = 1779344353 + intValue = -206540409 ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("tk") - static int[] field920; - @ObfuscatedName("tn") - static int[] field921; - @ObfuscatedName("pn") + static int field863; + @ObfuscatedName("ru") + static int[] field788; + @ObfuscatedName("pu") @ObfuscatedGetter( - intValue = -391943327 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("na") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("py") - @ObfuscatedGetter( - intValue = -1040328597 + intValue = 636733525 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("sl") - @ObfuscatedSignature( - signature = "[Lm;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("st") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("ss") + @ObfuscatedName("rp") + static int[] field730; + @ObfuscatedName("rs") + static int[] field929; + @ObfuscatedName("pr") @ObfuscatedGetter( - intValue = 2033282957 + intValue = 336519687 ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("mf") + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("rz") + static int[] field930; + @ObfuscatedName("nr") + static int[] field866; + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -89243397 + intValue = -1815085637 ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("qg") + static int field772; + @ObfuscatedName("tj") + static int[] field955; + @ObfuscatedName("tk") + static int[] field956; + @ObfuscatedName("nf") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("qc") @ObfuscatedGetter( - intValue = -1907233593 + intValue = 1328358885 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("ma") + @ObfuscatedName("mo") @ObfuscatedGetter( - intValue = 1843511131 + intValue = 1227039409 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("mz") + @ObfuscatedGetter( + intValue = 1509251187 ) @Export("weight") static int weight; - @ObfuscatedName("qu") + @ObfuscatedName("qa") @ObfuscatedGetter( - intValue = -1100066023 + intValue = -1279257455 ) - @Export("musicVolume") - static int musicVolume; - @ObfuscatedName("nt") + @Export("destinationX") + static int destinationX; + @ObfuscatedName("qk") @ObfuscatedGetter( - intValue = -1399282537 + intValue = 1618575593 ) - static int field841; - @ObfuscatedName("rk") - static boolean[] field775; - @ObfuscatedName("qb") + @Export("destinationY") + static int destinationY; + @ObfuscatedName("sv") @ObfuscatedGetter( - intValue = 569870541 + intValue = 1159687403 ) - @Export("areaSoundEffectVolume") - static int areaSoundEffectVolume; - @ObfuscatedName("ry") - static int[] field892; - @ObfuscatedName("ru") - static int[] field699; - @ObfuscatedName("sh") - @ObfuscatedGetter( - intValue = 1166836543 - ) - static int field910; - @ObfuscatedName("rx") - static int[] field894; - @ObfuscatedName("mc") + static int field945; + @ObfuscatedName("so") @ObfuscatedSignature( - signature = "Lhn;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("rl") - @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhk;" ) @Export("playerAppearance") static PlayerAppearance playerAppearance; - @ObfuscatedName("ro") - static int[] field895; - @ObfuscatedName("mb") + @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 = "Lhn;" + signature = "Lhe;" ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("sw") + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("om") @ObfuscatedGetter( - intValue = -1075965475 + intValue = -649542909 ) - static int field911; - @ObfuscatedName("nk") - static int[] field832; - @ObfuscatedName("ng") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("nm") + static int field877; + @ObfuscatedName("qv") @ObfuscatedGetter( - intValue = 584378815 + intValue = 702335711 ) - static int field823; - @ObfuscatedName("nv") + @Export("musicVolume") + static int musicVolume; + @ObfuscatedName("qr") @ObfuscatedGetter( - intValue = 1832354705 - ) - static int field833; - @ObfuscatedName("nr") - @ObfuscatedGetter( - intValue = 1067328579 - ) - static int field835; - @ObfuscatedName("qh") - @ObfuscatedGetter( - intValue = 1605243509 + intValue = 2086274421 ) @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("qi") + @ObfuscatedName("qw") @Export("soundEffectIds") static int[] soundEffectIds; - @ObfuscatedName("qc") + @ObfuscatedName("qf") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; - @ObfuscatedName("qd") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("si") - @ObfuscatedSignature( - signature = "Llz;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("qy") - @ObfuscatedSignature( - signature = "[Lcs;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("qe") + @ObfuscatedName("qx") @ObfuscatedGetter( - intValue = -1155592801 + intValue = -1155655175 ) @Export("minimapState") static int minimapState; - @ObfuscatedName("qf") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("qs") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("pj") + @ObfuscatedName("qm") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("qz") @ObfuscatedGetter( - intValue = 1175842115 - ) - static int field704; - @ObfuscatedName("pp") - @ObfuscatedGetter( - longValue = -1084323639285145485L - ) - static long field702; - @ObfuscatedName("qt") - @ObfuscatedGetter( - intValue = 1226020911 + intValue = 1919940513 ) @Export("soundEffectVolume") static int soundEffectVolume; - @ObfuscatedName("pu") - @ObfuscatedGetter( - intValue = -1024835233 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("pw") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("pt") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = -1315339885 - ) - static int field813; - @ObfuscatedName("pg") + @ObfuscatedName("qu") @ObfuscatedSignature( - signature = "[Llt;" + signature = "[Ldj;" ) - @Export("mapIcons") - static Sprite[] mapIcons; - @ObfuscatedName("my") + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qp") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("sf") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = 712982519 + intValue = 1453786377 + ) + static int field726; + @ObfuscatedName("sz") + @ObfuscatedGetter( + intValue = 1144280751 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("nm") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("ny") + @ObfuscatedGetter( + intValue = 387310397 + ) + static int field869; + @ObfuscatedName("pe") + @ObfuscatedGetter( + longValue = 1482293430841042491L + ) + static long field904; + @ObfuscatedName("mu") + @ObfuscatedGetter( + intValue = -1182225561 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("nb") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("rd") - static short field908; - @ObfuscatedName("np") - @ObfuscatedGetter( - intValue = 539828499 + @ObfuscatedName("md") + @ObfuscatedSignature( + signature = "Lhe;" ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("re") - static short field897; - @ObfuscatedName("rv") - static short field819; - @ObfuscatedName("mp") + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("me") @ObfuscatedGetter( - intValue = 1687250363 + intValue = -1652911979 ) - static int field811; - @ObfuscatedName("rr") - static short field903; - @ObfuscatedName("rj") - static short field673; - @ObfuscatedName("ri") + static int field845; + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = -589414587 + intValue = -720502757 ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rf") - static short field900; - @ObfuscatedName("rz") + static int field695; + @ObfuscatedName("or") @ObfuscatedGetter( - intValue = 1429063259 + intValue = -29948065 ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = 846238467 + static int field874; + @ObfuscatedName("sp") + @ObfuscatedSignature( + signature = "Lmm;" ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("ne") + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("rg") + static short field931; + @ObfuscatedName("ma") @ObfuscatedGetter( - intValue = -114993345 - ) - static int field842; - @ObfuscatedName("mz") - @ObfuscatedGetter( - intValue = 1973962691 + intValue = 1416910623 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("rt") + @ObfuscatedName("rk") + static short field932; + @ObfuscatedName("rm") + static short field937; + @ObfuscatedName("ra") + static short field938; + @ObfuscatedName("pm") @ObfuscatedGetter( - intValue = -1457697577 + 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") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("nh") + @ObfuscatedGetter( + intValue = 19610687 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("pg") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("ps") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("ph") + @ObfuscatedGetter( + intValue = 180652911 + ) + static int field900; + @ObfuscatedName("si") + @ObfuscatedGetter( + intValue = 2055926497 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("ro") + @ObfuscatedGetter( + intValue = -367442815 ) @Export("viewportOffsetX") static int viewportOffsetX; - @ObfuscatedName("rw") + @ObfuscatedName("sh") @ObfuscatedGetter( - intValue = 1641050699 + intValue = -1701342831 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("pz") + @ObfuscatedName("rj") @ObfuscatedGetter( - intValue = 1835135495 + intValue = -527659011 ) - static int field762; - @ObfuscatedName("pf") - static long[] field865; - @ObfuscatedName("ml") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("nq") + static int field925; + @ObfuscatedName("pa") @ObfuscatedGetter( - intValue = -2044772591 + intValue = -2121206743 ) - static int field795; - @ObfuscatedName("pm") - static int[] field869; - @ObfuscatedName("pr") - static int[] field868; - @ObfuscatedName("om") - @ObfuscatedSignature( - signature = "Ljw;" - ) - static NodeDeque field846; - @ObfuscatedName("ol") - @ObfuscatedSignature( - signature = "Ljw;" - ) - static NodeDeque field847; - @ObfuscatedName("pi") + static int field901; + @ObfuscatedName("os") @ObfuscatedGetter( - intValue = -1435172975 - ) - static int field715; - @ObfuscatedName("rq") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rs") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("mu") - @ObfuscatedGetter( - intValue = 206170513 - ) - static int field808; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = 1466636235 - ) - static int field664; - @ObfuscatedName("ny") - @ObfuscatedGetter( - intValue = -2045672721 + intValue = -1525951485 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pd") - static int[] field861; - @ObfuscatedName("pa") - static String field780; - @ObfuscatedName("sb") + @ObfuscatedName("sn") + @ObfuscatedGetter( + intValue = -453519891 + ) + static int field898; + @ObfuscatedName("pw") + static int[] field872; + @ObfuscatedName("of") @ObfuscatedSignature( - signature = "Lbd;" + 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; + @ObfuscatedName("sd") + @ObfuscatedSignature( + signature = "[Lb;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("oi") + @ObfuscatedGetter( + intValue = -681527765 + ) + static int field774; + @ObfuscatedName("pi") + static int[] field895; + @ObfuscatedName("pt") + static String field814; + @ObfuscatedName("sk") + @ObfuscatedSignature( + signature = "Lbl;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfv;" + signature = "[Lfm;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ah") - static boolean field922; - @ObfuscatedName("bq") + @ObfuscatedName("aw") + static boolean field749; + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1070916763 + intValue = 67970213 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1124780897 + intValue = -454237971 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 762805581 + intValue = 50872335 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bt") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 2121027027 - ) - static int field672; - @ObfuscatedName("bn") - @ObfuscatedGetter( - intValue = 1947983405 + intValue = -1948298563 ) @Export("clientType") static int clientType; - @ObfuscatedName("bm") + @ObfuscatedName("bv") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("ba") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -873301681 + intValue = -734659311 ) @Export("gameState") static int gameState; - @ObfuscatedName("cd") + @ObfuscatedName("cg") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("ct") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 996993213 + intValue = -2024138363 ) @Export("cycle") static int cycle; - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedGetter( - longValue = -3748954884429607225L + longValue = -2067581052141850097L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cm") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -241635753 + intValue = -1167045491 ) - static int field657; + static int field691; @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 235164627 + intValue = 736381377 ) - static int field912; - @ObfuscatedName("cu") + static int field692; + @ObfuscatedName("cb") @ObfuscatedGetter( - longValue = -8326458938814166675L + longValue = -9018780370059554257L ) - static long field745; + static long field875; @ObfuscatedName("cy") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("ce") + @ObfuscatedName("ct") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cw") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1706106531 + intValue = -475175391 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cq") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 2120122053 + intValue = -1953007669 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("ci") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1436156017 + intValue = 538709907 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("ca") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 1200698835 + intValue = 1820154893 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cc") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -59894547 + intValue = -528461793 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("ch") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 228888197 + intValue = -89638729 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cx") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1687993100 + intValue = 806134121 ) @Export("hintArrowHeight") static int hintArrowHeight; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 1422789440 + intValue = 1105349969 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("cs") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = -1150277369 + intValue = 634022549 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("cv") + @ObfuscatedName("du") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dm") + @ObfuscatedName("dz") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lcb;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("ds") + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = 544123225 + intValue = 1329734549 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("do") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = 802630795 + intValue = 887284589 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("di") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 679409999 + intValue = -1245813257 ) - static int field675; - @ObfuscatedName("dy") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("ee") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("ec") + static int field709; + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = 788466911 + intValue = -303941171 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("el") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = 598488389 + intValue = 1964000781 ) @Export("loginState") static int loginState; - @ObfuscatedName("eq") - @ObfuscatedGetter( - intValue = 1283349071 - ) - static int field679; - @ObfuscatedName("eu") - @ObfuscatedGetter( - intValue = -1801662641 - ) - static int field680; - @ObfuscatedName("et") - @ObfuscatedGetter( - intValue = -1956928739 - ) - static int field681; - @ObfuscatedName("es") - @ObfuscatedSignature( - signature = "Lfn;" - ) - static class160 field682; @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -1694065133 + intValue = -1937308451 ) - @Export("port2") - static int port2; + static int field712; + @ObfuscatedName("ec") + @ObfuscatedGetter( + intValue = -1595212999 + ) + static int field713; @ObfuscatedName("ev") - @Export("Login_isUsernameRemembered") - static boolean Login_isUsernameRemembered; + @ObfuscatedGetter( + intValue = -1280111513 + ) + static int field714; @ObfuscatedName("eb") @ObfuscatedSignature( - signature = "Lcm;" + signature = "Lfu;" + ) + static class169 field715; + @ObfuscatedName("ez") + @Export("Login_isUsernameRemembered") + static boolean Login_isUsernameRemembered; + @ObfuscatedName("ek") + @ObfuscatedSignature( + signature = "Lca;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ej") + @ObfuscatedName("fk") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ew") + @ObfuscatedName("ff") @ObfuscatedSignature( - signature = "[Lcg;" + signature = "[Lcd;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("ed") + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = 1706473169 + intValue = -13803859 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fl") + @ObfuscatedName("fo") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fp") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = 1670938007 + intValue = 1186510191 ) - static int field690; - @ObfuscatedName("fx") - static int[] field867; - @ObfuscatedName("fh") + static int field851; + @ObfuscatedName("fv") + static int[] field725; + @ObfuscatedName("fg") @ObfuscatedSignature( - signature = "Lci;" + signature = "Ldv;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fz") + @ObfuscatedName("fu") @ObfuscatedGetter( - intValue = -446741929 + intValue = -842980155 ) @Export("logoutTimer") static int logoutTimer; + @ObfuscatedName("ft") + static boolean field728; @ObfuscatedName("fj") - static boolean field800; - @ObfuscatedName("fw") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("ff") + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "Ljn;" + signature = "Ljr;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fv") + @ObfuscatedName("fe") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("fc") + @ObfuscatedName("gw") @ObfuscatedGetter( - intValue = 1167098885 + intValue = 1736766239 ) - static int field791; - @ObfuscatedName("ft") + static int field818; + @ObfuscatedName("gu") @ObfuscatedGetter( - intValue = 1435781107 + intValue = 237208089 ) - static int field884; - @ObfuscatedName("fr") + static int field921; + @ObfuscatedName("gt") @ObfuscatedGetter( - intValue = 1220114723 + intValue = -1880791937 ) - static int field700; - @ObfuscatedName("gb") + static int field734; + @ObfuscatedName("gz") @ObfuscatedGetter( - intValue = -920973165 + intValue = 313478257 ) - static int field733; - @ObfuscatedName("gi") + static int field735; + @ObfuscatedName("ga") @ObfuscatedGetter( - intValue = 1525628521 + intValue = -965509961 ) - static int field695; - @ObfuscatedName("gx") + static int field899; + @ObfuscatedName("gs") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gp") + @ObfuscatedName("gk") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("go") - static final int[] field743; - @ObfuscatedName("gf") + @ObfuscatedName("gl") + static final int[] field699; + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = -115001383 + intValue = -352208827 ) - static int field707; - @ObfuscatedName("ht") - @ObfuscatedGetter( - intValue = 1088390909 - ) - static int field870; - @ObfuscatedName("hc") - @ObfuscatedGetter( - intValue = -1687869927 - ) - static int field709; + static int field741; @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = -2107893215 + intValue = 952516679 ) - static int field710; - @ObfuscatedName("hf") + static int field742; + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 404388609 + intValue = -499490457 ) - static int field711; + static int field747; + @ObfuscatedName("hq") + @ObfuscatedGetter( + intValue = 1112772085 + ) + static int field744; + @ObfuscatedName("hw") + @ObfuscatedGetter( + intValue = 59309843 + ) + static int field745; @ObfuscatedName("hb") - static boolean field712; - @ObfuscatedName("hj") + static boolean field746; + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -922297079 + intValue = -71090641 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hm") + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = 2017298607 + intValue = -1566395531 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hg") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 715685771 + intValue = 442725255 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hy") + @ObfuscatedName("ha") @ObfuscatedGetter( - intValue = -1271117347 + intValue = 139375317 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hk") + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -502249305 + intValue = -2038484537 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hv") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 1265592985 + intValue = 702140089 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("ho") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = -229935521 + intValue = 1980402249 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hz") + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = 573387673 + intValue = -167717143 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("hh") + @ObfuscatedName("im") @ObfuscatedGetter( - intValue = -758522723 + intValue = 1280381451 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("hr") + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = -654913029 + intValue = -586245253 ) - static int field647; - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = 1993254297 - ) - static int field723; + static int field756; @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = 955066829 + intValue = 1464169135 + ) + static int field757; + @ObfuscatedName("iv") + @ObfuscatedGetter( + intValue = -660367395 ) static int field724; - @ObfuscatedName("ia") + @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -1010817559 + intValue = -949088515 + ) + static int field759; + @ObfuscatedName("ip") + @ObfuscatedGetter( + intValue = -412319227 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ib") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 2046982327 + intValue = -493333163 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; + @ObfuscatedName("ia") + @ObfuscatedGetter( + intValue = 1356416223 + ) + static int field762; @ObfuscatedName("in") - @ObfuscatedGetter( - intValue = 631186879 - ) - static int field727; - @ObfuscatedName("ic") - static boolean field728; - @ObfuscatedName("id") - @ObfuscatedGetter( - intValue = 1899106867 - ) - static int field729; - @ObfuscatedName("ij") - static boolean field730; - @ObfuscatedName("im") - @ObfuscatedGetter( - intValue = 1534235447 - ) - static int field818; + static boolean field770; @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = 489065879 + 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; - @ObfuscatedName("iu") - @ObfuscatedGetter( - intValue = 546122341 - ) - @Export("overheadTextLimit") - static int overheadTextLimit; - @ObfuscatedName("io") - @Export("overheadTextXs") - static int[] overheadTextXs; - @ObfuscatedName("iy") - @Export("overheadTextYs") - static int[] overheadTextYs; - @ObfuscatedName("iv") - @Export("overheadTextAscents") - static int[] overheadTextAscents; - @ObfuscatedName("iq") - @Export("overheadTextXOffsets") - static int[] overheadTextXOffsets; - @ObfuscatedName("is") - @Export("overheadTextColors") - static int[] overheadTextColors; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; @ObfuscatedName("iw") + @ObfuscatedGetter( + intValue = 975397305 + ) + @Export("overheadTextLimit") + static int overheadTextLimit; + @ObfuscatedName("if") + @Export("overheadTextXs") + static int[] overheadTextXs; + @ObfuscatedName("ib") + @Export("overheadTextYs") + static int[] overheadTextYs; + @ObfuscatedName("id") + @Export("overheadTextAscents") + static int[] overheadTextAscents; + @ObfuscatedName("il") + @Export("overheadTextXOffsets") + static int[] overheadTextXOffsets; + @ObfuscatedName("iu") + @Export("overheadTextColors") + static int[] overheadTextColors; + @ObfuscatedName("is") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("il") + @ObfuscatedName("jq") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ir") + @ObfuscatedName("ji") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("if") + @ObfuscatedName("jv") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ih") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 2113059389 + intValue = -2121599307 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("ig") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = 770836743 + intValue = 367239901 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("ip") + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = 1799484349 + intValue = 315568117 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jq") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -247632533 + intValue = 1079427097 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jj") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 217544107 + intValue = 2092751039 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jw") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 250308260 + intValue = -518761301 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jr") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = 14031919 + intValue = -806793857 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jg") + @ObfuscatedName("jm") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jb") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -1559592119 + intValue = 2013290137 ) - static int field751; + static int field786; + @ObfuscatedName("jg") + @ObfuscatedGetter( + intValue = -1764977003 + ) + static int field880; @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -769809143 - ) - static int field752; - @ObfuscatedName("ji") - @ObfuscatedGetter( - intValue = 680963965 + intValue = -540153301 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jc") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = -509412397 + intValue = -1956792499 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jn") + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = 24720215 + intValue = -1891050173 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jt") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = -200424637 + intValue = -1965076329 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jk") - static boolean field757; - @ObfuscatedName("jx") + @ObfuscatedName("jf") + static boolean field887; + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 1665305383 + intValue = -1524629153 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jf") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 1608164289 + intValue = -1322333605 ) - static int field759; - @ObfuscatedName("jp") + static int field794; + @ObfuscatedName("js") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("jh") + @ObfuscatedName("kw") @ObfuscatedSignature( - signature = "[Lba;" + signature = "[Lbi;" ) @Export("players") static Player[] players; - @ObfuscatedName("jd") + @ObfuscatedName("ke") @ObfuscatedGetter( - intValue = 356089511 + intValue = -767774261 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("jz") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = -2132889429 + intValue = -1853665647 ) - static int field763; - @ObfuscatedName("jl") + static int field798; + @ObfuscatedName("kr") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kh") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = 1701089391 + intValue = -931711387 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kj") + @ObfuscatedName("kn") @ObfuscatedGetter( - intValue = -425837641 + intValue = 2084987415 ) - static int field766; + static int field801; @ObfuscatedName("kq") - static int[] field828; - @ObfuscatedName("kb") + static int[] field918; + @ObfuscatedName("kc") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ko") + @ObfuscatedName("ka") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kc") + @ObfuscatedName("kf") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; @ObfuscatedName("kg") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kt") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -1908938957 + intValue = -246802771 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("ks") + @ObfuscatedName("kh") @ObfuscatedSignature( - signature = "[[[Ljw;" + signature = "[[[Ljh;" ) @Export("groundItems") static NodeDeque[][][] groundItems; @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kd") + @ObfuscatedName("kz") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("ka") + @ObfuscatedName("kj") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("ki") + @ObfuscatedName("kb") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kf") + @ObfuscatedName("kd") @Export("levels") static int[] levels; - @ObfuscatedName("kr") + @ObfuscatedName("kl") @Export("experience") static int[] experience; - @ObfuscatedName("kw") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 1989694785 + intValue = 1453030713 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("kv") + @ObfuscatedName("lb") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ld") + @ObfuscatedName("lg") @ObfuscatedGetter( - intValue = -1335676379 + intValue = -637671939 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lr") + @ObfuscatedName("lf") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lh") + @ObfuscatedName("lx") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lp") + @ObfuscatedName("ly") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("lu") + @ObfuscatedName("ll") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("ln") + @ObfuscatedName("lh") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ll") + @ObfuscatedName("ln") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lq") + @ObfuscatedName("lw") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lb") + @ObfuscatedName("lv") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lf") + @ObfuscatedName("lz") @Export("shiftClickDrop") static boolean shiftClickDrop; @ObfuscatedName("li") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lt") + @ObfuscatedName("lj") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lx") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = -1770752135 + intValue = -79678249 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lm") + @ObfuscatedName("le") @ObfuscatedGetter( - intValue = 1940696691 + intValue = 521048769 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("lv") + @ObfuscatedName("lp") @ObfuscatedGetter( - intValue = 1680914597 + intValue = -1517512791 ) - static int field796; - @ObfuscatedName("le") + static int field871; + @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = 1451138947 + intValue = 668929195 ) - static int field797; - @ObfuscatedName("ly") + static int field832; + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = 353529783 + intValue = -19686459 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("lk") + @ObfuscatedName("mq") + @ObfuscatedGetter( + intValue = 630410191 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("mi") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("ls") + @ObfuscatedName("mw") @ObfuscatedGetter( - intValue = -678517667 + intValue = -335979293 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mv") + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = 259223343 + intValue = -167301685 ) - static int field802; - @ObfuscatedName("mn") + static int field837; + @ObfuscatedName("mc") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mo") + @ObfuscatedName("mx") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("me") + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 1383553915 + intValue = -1504817189 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mx") + @ObfuscatedName("mn") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; + @ObfuscatedName("eg") + @ObfuscatedSignature( + signature = "Lkb;" + ) + Buffer field718; + @ObfuscatedName("es") + @ObfuscatedSignature( + signature = "Le;" + ) + class9 field719; static { - field922 = true; + field749 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1300,9 +1303,9 @@ public final class Client extends GameShell implements Usernamed { isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = -1L; - field657 = -1; - field912 = -1; - field745 = -1L; + field691 = -1; + field692 = -1; + field875 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1318,42 +1321,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field675 = 0; + field709 = 0; js5Errors = 0; loginState = 0; - field679 = 0; - field680 = 0; - field681 = 0; - field682 = class160.field1993; + field712 = 0; + field713 = 0; + field714 = 0; + field715 = class169.field2008; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field690 = 0; - field867 = new int[250]; + field851 = 0; + field725 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field800 = false; + field728 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); - field791 = 0; - field884 = 1; - field700 = 0; - field733 = 1; - field695 = 0; + field818 = 0; + field921 = 1; + field734 = 0; + field735 = 1; + field899 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field743 = 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}; - field707 = 0; - field870 = 2301979; - field709 = 5063219; - field710 = 3353893; - field711 = 7759444; - field712 = false; + 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; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1363,16 +1366,16 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field647 = 0; - field723 = 0; + field757 = 0; field724 = 0; + field759 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field727 = 0; - field728 = false; - field729 = 0; - field730 = false; - field818 = 0; + field762 = 0; + field770 = false; + field764 = 0; + field765 = false; + field941 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1392,23 +1395,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field751 = 0; - field752 = 0; + field786 = 0; + field880 = 0; dragItemSlotSource = 0; draggedWidgetX = 0; draggedWidgetY = 0; dragItemSlotDestination = 0; - field757 = false; + field887 = false; itemDragDuration = 0; - field759 = 0; + field794 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field763 = 0; + field798 = 0; renderSelf = true; drawPlayerNames = 0; - field766 = 0; - field828 = new int[1000]; + field801 = 0; + field918 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1437,21 +1440,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field796 = 0; - field797 = 50; + field871 = 0; + field832 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field802 = -1; + field837 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field808 = 0; - field664 = -1; + field842 = 0; + field843 = -1; chatEffects = 0; - field811 = 0; + field845 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1464,54 +1467,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field824 = false; - field919 = -1; - field826 = -1; - field827 = false; - field864 = -1; - field829 = -1; + field732 = false; + field859 = -1; + field881 = -1; + field861 = false; + field834 = -1; + field863 = -1; isDraggingWidget = false; cycleCntr = 1; - field832 = new int[32]; - field833 = 0; + field866 = new int[32]; + field772 = 0; changedItemContainers = new int[32]; - field835 = 0; + field869 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field839 = 0; - field823 = 0; - field841 = 0; - field842 = 0; - field795 = 0; + field873 = 0; + field874 = 0; + field774 = 0; + field726 = 0; + field877 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field846 = new NodeDeque(); - field847 = new NodeDeque(); + field727 = new NodeDeque(); + field919 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field850 = -2; - field851 = new boolean[100]; - field852 = new boolean[100]; - field853 = new boolean[100]; + field884 = -2; + field679 = new boolean[100]; + field886 = new boolean[100]; + field813 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field859 = 0L; + field893 = 0L; isResizable = true; - field861 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field895 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field780 = ""; - field865 = new long[100]; - field715 = 0; - field762 = 0; - field868 = new int[128]; - field869 = new int[128]; - field702 = -1L; - field704 = -1; + field814 = ""; + field846 = new long[100]; + field900 = 0; + field901 = 0; + field902 = new int[128]; + field872 = new int[128]; + field904 = -1L; + field695 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1521,7 +1524,7 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; musicVolume = 255; currentTrackGroupId = -1; - field881 = false; + field915 = false; soundEffectVolume = 127; areaSoundEffectVolume = 127; soundEffectCount = 0; @@ -1531,47 +1534,47 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field775 = new boolean[5]; - field892 = new int[5]; - field699 = new int[5]; - field894 = new int[5]; - field895 = new int[5]; - field908 = 256; - field897 = 205; + field926 = new boolean[5]; + field788 = new int[5]; + field730 = new int[5]; + field929 = new int[5]; + field930 = new int[5]; + field931 = 256; + field932 = 205; zoomHeight = 256; zoomWidth = 320; - field900 = 1; - field673 = 32767; - field819 = 1; - field903 = 32767; + field935 = 1; + field748 = 32767; + field937 = 1; + field938 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field910 = -1; - field911 = -1; + field945 = -1; + field946 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field888 = -1; + field891 = -1; archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field813 = 0; - field809 = new class65(); - field920 = new int[50]; - field921 = new int[50]; + field898 = 0; + field954 = new class74(); + field955 = new int[50]; + field956 = new int[50]; } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1781530375" + signature = "(B)V", + garbageValue = "108" ) @Export("resizeGame") protected final void resizeGame() { - field859 = WorldMapIcon_0.currentTimeMillis() + 500L; + field893 = class217.currentTimeMillis() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1579,687 +1582,351 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "159835862" + garbageValue = "-678556074" ) @Export("setUp") protected final void setUp() { - NetFileRequest.method4217(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + 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; - port2 = gameBuild == 0 ? 443 : worldId + 50000; - WorldMapSection2.port3 = WorldMapLabelSize.port1; - WorldMapLabelSize.field128 = class215.field2552; - PlayerAppearance.field2545 = class215.field2553; - PlayerAppearance.field2547 = class215.field2551; - class208.field2514 = class215.field2550; - WorldMapData_0.urlRequester = new UrlRequester(); + 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(); this.setUpKeyboard(); this.setUpMouse(); - PacketWriter.mouseWheel = this.mouseWheel(); - TileItem.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - AccessFile var2 = null; - ClientPreferences var3 = new ClientPreferences(); - - try { - var2 = WorldMapRectangle.getPreferencesFile("", class14.field102.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) { - } - - WorldMapSection2.clientPreferences = var3; + SecureRandomFuture.mouseWheel = this.mouseWheel(); + WorldMapRegion.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + GrandExchangeOfferOwnWorldComparator.clientPreferences = WorldMapData_1.method813(); this.setUpClipboard(); - String var9 = GrandExchangeOfferUnitPriceComparator.null_string; - class51.applet = this; - if (var9 != null) { - class51.field431 = var9; + String var4 = WorldMapCacheName.null_string; + class60.applet = this; + if (var4 != null) { + class60.field462 = var4; } if (gameBuild != 0) { displayFps = true; } - VertexNormal.setWindowedMode(WorldMapSection2.clientPreferences.windowMode); - KeyHandler.friendSystem = new FriendSystem(class192.loginType); + WorldMapIcon_1.setWindowedMode(GrandExchangeOfferOwnWorldComparator.clientPreferences.windowMode); + Projectile.friendSystem = new FriendSystem(WorldMapIcon_0.loginType); } - @ObfuscatedName("ak") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1684911639" + signature = "(B)V", + garbageValue = "-113" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - ClientPreferences.method1854(); - int var1; - try { - if (class197.field2414 == 1) { - var1 = class197.midiPcmStream.method3764(); - if (var1 > 0 && class197.midiPcmStream.isReady()) { - var1 -= class197.field2412; - if (var1 < 0) { - var1 = 0; - } - - class197.midiPcmStream.setPcmStreamVolume(var1); - } else { - class197.midiPcmStream.clear(); - class197.midiPcmStream.removeAll(); - if (UserComparator5.musicTrackArchive != null) { - class197.field2414 = 2; - } else { - class197.field2414 = 0; - } - - FileSystem.musicTrack = null; - class197.soundCache = null; - } + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } - } catch (Exception var50) { - var50.printStackTrace(); - class197.midiPcmStream.clear(); - class197.field2414 = 0; - FileSystem.musicTrack = null; - class197.soundCache = null; - UserComparator5.musicTrackArchive = null; - } - UserComparator3.playPcmPlayers(); - BoundaryObject.method3333(); - UserComparator10.method3476(); - if (PacketWriter.mouseWheel != null) { - var1 = PacketWriter.mouseWheel.useRotation(); - mouseWheelRotation = var1; - } - - if (gameState == 0) { - class225.load(); - class2.method24(); - } else if (gameState == 5) { - GrandExchangeEvents.doCycleTitle(this); - class225.load(); - class2.method24(); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - GrandExchangeEvents.doCycleTitle(this); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - UserComparator4.method3442(false); - field791 = 0; - boolean var51 = true; - - int var2; - for (var2 = 0; var2 < Tiles.regionLandArchives.length; ++var2) { - if (class30.regionMapArchiveIds[var2] != -1 && Tiles.regionLandArchives[var2] == null) { - Tiles.regionLandArchives[var2] = NetSocket.archive5.takeFile(class30.regionMapArchiveIds[var2], 0); - if (Tiles.regionLandArchives[var2] == null) { - var51 = false; - ++field791; - } - } - - if (class65.regionLandArchiveIds[var2] != -1 && class226.regionMapArchives[var2] == null) { - class226.regionMapArchives[var2] = NetSocket.archive5.takeFileEncrypted(class65.regionLandArchiveIds[var2], 0, JagexCache.xteaKeys[var2]); - if (class226.regionMapArchives[var2] == null) { - var51 = false; - ++field791; - } - } - } - - if (!var51) { - field695 = 1; - } else { - field700 = 0; - var51 = true; - - int var4; - int var5; - for (var2 = 0; var2 < Tiles.regionLandArchives.length; ++var2) { - byte[] var3 = class226.regionMapArchives[var2]; - if (var3 != null) { - var4 = (FriendsList.regions[var2] >> 8) * 64 - Messages.baseX * 64; - var5 = (FriendsList.regions[var2] & 255) * 64 - Language.baseY * 64; - if (isInInstance) { - var4 = 10; - var5 = 10; + 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; } - var51 &= BufferedSink.method5913(var3, var4, var5); - } - } - - if (!var51) { - field695 = 2; - } else { - if (field695 != 0) { - class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - UserComparator3.playPcmPlayers(); - ServerBuild.scene.clear(); - - for (var2 = 0; var2 < 4; ++var2) { - collisionMaps[var2].clear(); - } - - int var44; - for (var2 = 0; var2 < 4; ++var2) { - for (var44 = 0; var44 < 104; ++var44) { - for (var4 = 0; var4 < 104; ++var4) { - Tiles.Tiles_renderFlags[var2][var44][var4] = 0; - } - } - } - - UserComparator3.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.field502 = new byte[4][104][104]; - Tiles.field514 = new byte[4][104][104]; - Tiles.field507 = new byte[4][104][104]; - Tiles.field518 = new byte[4][104][104]; - UrlRequest.field1940 = new int[4][105][105]; - InterfaceParent.field565 = new byte[4][105][105]; - Tiles.field509 = new int[105][105]; - class268.Tiles_hue = new int[104]; - HorizontalAlignment.Tiles_saturation = new int[104]; - class30.Tiles_lightness = new int[104]; - class40.Tiles_hueMultiplier = new int[104]; - TileItemPile.field1529 = new int[104]; - var2 = Tiles.regionLandArchives.length; - UrlRequest.method3375(); - UserComparator4.method3442(true); - int var7; - int var8; - int var10; - int var11; - int var12; - int var13; - int var47; - if (!isInInstance) { - var44 = 0; - - label611: - while (true) { - byte[] var6; - if (var44 >= var2) { - for (var44 = 0; var44 < var2; ++var44) { - var4 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; - var5 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; - var6 = Tiles.regionLandArchives[var44]; - if (var6 == null && Language.field2359 < 800) { - UserComparator3.playPcmPlayers(); - KitDefinition.method4532(var4, var5, 64, 64); - } - } - - UserComparator4.method3442(true); - var44 = 0; - - while (true) { - if (var44 >= var2) { - break label611; - } - - byte[] var46 = class226.regionMapArchives[var44]; - if (var46 != null) { - var5 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; - var47 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; - UserComparator3.playPcmPlayers(); - class160.method3518(var46, var5, var47, ServerBuild.scene, collisionMaps); - } - - ++var44; - } - } - - var4 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; - var5 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; - var6 = Tiles.regionLandArchives[var44]; - if (var6 != null) { - UserComparator3.playPcmPlayers(); - var7 = SecureRandomCallable.field530 * 8 - 48; - var8 = Language.field2359 * 8 - 48; - CollisionMap[] var9 = collisionMaps; - var10 = 0; - - label608: - while (true) { - if (var10 >= 4) { - Buffer var45 = new Buffer(var6); - var11 = 0; - - while (true) { - if (var11 >= 4) { - break label608; - } - - for (var12 = 0; var12 < 64; ++var12) { - for (var13 = 0; var13 < 64; ++var13) { - WorldMapArea.loadTerrain(var45, var11, var4 + var12, var5 + var13, var7, var8, 0); - } - } - - ++var11; - } - } - - for (var11 = 0; var11 < 64; ++var11) { - for (var12 = 0; var12 < 64; ++var12) { - if (var11 + var4 > 0 && var11 + var4 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { - int[] var10000 = var9[var10].flags[var11 + var4]; - var10000[var12 + var5] &= -16777217; - } - } - } - - ++var10; - } - } - - ++var44; - } - } - - int var48; - if (isInInstance) { - var44 = 0; - - label557: - while (true) { - if (var44 >= 4) { - for (var44 = 0; var44 < 13; ++var44) { - for (var4 = 0; var4 < 13; ++var4) { - var5 = instanceChunkTemplates[0][var44][var4]; - if (var5 == -1) { - KitDefinition.method4532(var44 * 8, var4 * 8, 8, 8); - } - } - } - - UserComparator4.method3442(true); - var44 = 0; - - while (true) { - if (var44 >= 4) { - break label557; - } - - UserComparator3.playPcmPlayers(); - - for (var4 = 0; var4 < 13; ++var4) { - label480: - for (var5 = 0; var5 < 13; ++var5) { - var47 = instanceChunkTemplates[var44][var4][var5]; - if (var47 != -1) { - var7 = var47 >> 24 & 3; - var8 = var47 >> 1 & 3; - var48 = var47 >> 14 & 1023; - var10 = var47 >> 3 & 2047; - var11 = (var48 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < FriendsList.regions.length; ++var12) { - if (FriendsList.regions[var12] == var11 && class226.regionMapArchives[var12] != null) { - byte[] var49 = class226.regionMapArchives[var12]; - int var14 = var4 * 8; - int var15 = var5 * 8; - int var16 = (var48 & 7) * 8; - int var17 = (var10 & 7) * 8; - Scene var18 = ServerBuild.scene; - CollisionMap[] var19 = collisionMaps; - Buffer var20 = new Buffer(var49); - int var21 = -1; - - while (true) { - int var22 = var20.method5589(); - if (var22 == 0) { - continue label480; - } - - var21 += var22; - int var23 = 0; - - while (true) { - int var24 = var20.readUShortSmart(); - if (var24 == 0) { - break; - } - - var23 += var24 - 1; - int var25 = var23 & 63; - int var26 = var23 >> 6 & 63; - int var27 = var23 >> 12; - int var28 = var20.readUnsignedByte(); - int var29 = var28 >> 2; - int var30 = var28 & 3; - if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { - ObjectDefinition var31 = Occluder.getObjectDefinition(var21); - int var32 = var14 + FloorDecoration.method2913(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); - int var35 = var26 & 7; - int var36 = var25 & 7; - int var38 = var31.sizeX; - int var39 = var31.sizeY; - int var40; - if ((var30 & 1) == 1) { - var40 = var38; - var38 = var39; - var39 = var40; - } - - int var37 = var8 & 3; - int var34; - if (var37 == 0) { - var34 = var36; - } else if (var37 == 1) { - var34 = 7 - var35 - (var38 - 1); - } else if (var37 == 2) { - var34 = 7 - var36 - (var39 - 1); - } else { - var34 = var35; - } - - var40 = var15 + var34; - if (var32 > 0 && var40 > 0 && var32 < 103 && var40 < 103) { - int var41 = var44; - if ((Tiles.Tiles_renderFlags[1][var32][var40] & 2) == 2) { - var41 = var44 - 1; - } - - CollisionMap var42 = null; - if (var41 >= 0) { - var42 = var19[var41]; - } - - ArchiveDiskActionHandler.method4336(var44, var32, var40, var21, var30 + var8 & 3, var29, var18, var42); - } - } - } - } - } - } - } - } - } - - ++var44; - } - } - - UserComparator3.playPcmPlayers(); - - for (var4 = 0; var4 < 13; ++var4) { - for (var5 = 0; var5 < 13; ++var5) { - boolean var54 = false; - var7 = instanceChunkTemplates[var44][var4][var5]; - if (var7 != -1) { - var8 = var7 >> 24 & 3; - var48 = var7 >> 1 & 3; - var10 = var7 >> 14 & 1023; - var11 = var7 >> 3 & 2047; - var12 = (var10 / 8 << 8) + var11 / 8; - - for (var13 = 0; var13 < FriendsList.regions.length; ++var13) { - if (FriendsList.regions[var13] == var12 && Tiles.regionLandArchives[var13] != null) { - ClientPreferences.method1853(Tiles.regionLandArchives[var13], var44, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var48, collisionMaps); - var54 = true; - break; - } - } - } - - if (!var54) { - var8 = var44; - var48 = var4 * 8; - var10 = var5 * 8; - - for (var11 = 0; var11 < 8; ++var11) { - for (var12 = 0; var12 < 8; ++var12) { - Tiles.Tiles_heights[var8][var48 + var11][var12 + var10] = 0; - } - } - - if (var48 > 0) { - for (var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var8][var48][var10 + var11] = Tiles.Tiles_heights[var8][var48 - 1][var10 + var11]; - } - } - - if (var10 > 0) { - for (var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var8][var48 + var11][var10] = Tiles.Tiles_heights[var8][var11 + var48][var10 - 1]; - } - } - - if (var48 > 0 && Tiles.Tiles_heights[var8][var48 - 1][var10] != 0) { - Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48 - 1][var10]; - } else if (var10 > 0 && Tiles.Tiles_heights[var8][var48][var10 - 1] != 0) { - Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48][var10 - 1]; - } else if (var48 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var48 - 1][var10 - 1] != 0) { - Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48 - 1][var10 - 1]; - } - } - } - } - - ++var44; - } - } - - UserComparator4.method3442(true); - UserComparator3.playPcmPlayers(); - GrandExchangeOfferNameComparator.method152(ServerBuild.scene, collisionMaps); - UserComparator4.method3442(true); - var44 = Tiles.Tiles_minPlane; - if (var44 > Clock.Client_plane) { - var44 = Clock.Client_plane; - } - - if (var44 < Clock.Client_plane - 1) { - var44 = Clock.Client_plane - 1; - } - - if (isLowDetail) { - ServerBuild.scene.init(Tiles.Tiles_minPlane); + class206.midiPcmStream.setPcmStreamVolume(var5); } else { - ServerBuild.scene.init(0); - } - - for (var4 = 0; var4 < 104; ++var4) { - for (var5 = 0; var5 < 104; ++var5) { - WorldMapEvent.updateItemPile(var4, var5); - } - } - - UserComparator3.playPcmPlayers(); - - for (PendingSpawn var52 = (PendingSpawn)pendingSpawns.last(); var52 != null; var52 = (PendingSpawn)pendingSpawns.previous()) { - if (var52.hitpoints == -1) { - var52.delay = 0; - WorldMapDecoration.method347(var52); + class206.midiPcmStream.clear(); + class206.midiPcmStream.removeAll(); + if (class206.musicTrackArchive != null) { + class206.field2406 = 2; } else { - var52.remove(); + class206.field2406 = 0; } + + class206.musicTrack = null; + UrlRequest.soundCache = null; } - - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var53; - if (Username.client.hasFrame()) { - var53 = TilePaint.getPacketBufferNode(ClientPacket.field2249, packetWriter.isaacCipher); - var53.packetBuffer.writeInt(1057001181); - packetWriter.addNode(var53); - } - - if (!isInInstance) { - var4 = (SecureRandomCallable.field530 - 6) / 8; - var5 = (SecureRandomCallable.field530 + 6) / 8; - var47 = (Language.field2359 - 6) / 8; - var7 = (Language.field2359 + 6) / 8; - - for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { - for (var48 = var47 - 1; var48 <= var7 + 1; ++var48) { - if (var8 < var4 || var8 > var5 || var48 < var47 || var48 > var7) { - NetSocket.archive5.loadRegionFromName("m" + var8 + "_" + var48); - NetSocket.archive5.loadRegionFromName("l" + var8 + "_" + var48); - } - } - } - } - - Projectile.updateGameState(30); - UserComparator3.playPcmPlayers(); - Players.method2179(); - var53 = TilePaint.getPacketBufferNode(ClientPacket.field2218, packetWriter.isaacCipher); - packetWriter.addNode(var53); - class2.method24(); } + } 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; + } + + 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(); + } + } else { + GrandExchangeOfferAgeComparator.doCycleTitle(this); + } + + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); + } + + return; } - } else { - GrandExchangeEvents.doCycleTitle(this); - } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } - } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1486807503" + signature = "(ZB)V", + garbageValue = "1" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = GrandExchangeOffer.method129(); - if (var2 && field881 && WorldMapLabelSize.pcmPlayer0 != null) { - WorldMapLabelSize.pcmPlayer0.tryDiscard(); + boolean var2; + label173: { + try { + if (class206.field2406 == 2) { + if (class206.musicTrack == null) { + class206.musicTrack = MusicTrack.readTrack(class206.musicTrackArchive, class206.musicTrackGroupId, class206.musicTrackFileId); + if (class206.musicTrack == null) { + var2 = false; + break label173; + } + } + + if (UrlRequest.soundCache == null) { + UrlRequest.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; + var2 = true; + break label173; + } + } + } catch (Exception var6) { + var6.printStackTrace(); + class206.midiPcmStream.clear(); + class206.field2406 = 0; + class206.musicTrack = null; + UrlRequest.soundCache = null; + class206.musicTrackArchive = null; + } + + var2 = false; } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field859 != 0L && WorldMapIcon_0.currentTimeMillis() > field859) { - VertexNormal.setWindowedMode(Friend.getWindowedMode()); + if (var2 && field915 && WorldMapManager.pcmPlayer0 != null) { + WorldMapManager.pcmPlayer0.tryDiscard(); } - int var3; + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field893 && class217.currentTimeMillis() > field893) { + WorldMapIcon_1.setWindowedMode(class74.getWindowedMode()); + } + + int var4; if (var1) { - for (var3 = 0; var3 < 100; ++var3) { - field851[var3] = true; + for (var4 = 0; var4 < 100; ++var4) { + field679[var4] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); + MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); + MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); } else if (gameState == 25) { - if (field695 == 1) { - if (field791 > field884) { - field884 = field791; + if (field899 == 1) { + if (field818 > field921) { + field921 = field818; } - var3 = (field884 * 50 - field791 * 50) / field884; - class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); - } else if (field695 == 2) { - if (field700 > field733) { - field733 = field700; + var4 = (field921 * 50 - field818 * 50) / field921; + AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else if (field899 == 2) { + if (field734 > field735) { + field735 = field734; } - var3 = (field733 * 50 - field700 * 50) / field733 + 50; - class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + var4 = (field735 * 50 - field734 * 50) / field735 + 50; + AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); } else { - class197.drawLoadingMessage("Loading - please wait.", false); + AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - class197.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + AbstractByteArrayCopier.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - class197.drawLoadingMessage("Please wait...", false); + AbstractByteArrayCopier.drawLoadingMessage("Please wait...", false); } } else { - NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); + MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for (var3 = 0; var3 < rootWidgetCount; ++var3) { - if (field852[var3]) { - DevicePcmPlayerProvider.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); - field852[var3] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { + if (field886[var4]) { + class206.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); + field886[var4] = false; } } } else if (gameState > 0) { - DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + class206.rasterProvider.drawFull(0, 0); - for (var3 = 0; var3 < rootWidgetCount; ++var3) { - field852[var3] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { + field886[var4] = false; } } } - @ObfuscatedName("aw") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2144356516" + signature = "(S)V", + garbageValue = "8226" ) @Export("kill0") protected final void kill0() { - if (class197.varcs.hasUnwrittenChanges()) { - class197.varcs.write(); + if (UserComparator4.varcs.hasUnwrittenChanges()) { + UserComparator4.varcs.write(); } - if (class16.mouseRecorder != null) { - class16.mouseRecorder.isRunning = false; + if (MidiPcmStream.mouseRecorder != null) { + MidiPcmStream.mouseRecorder.isRunning = false; } - class16.mouseRecorder = null; + MidiPcmStream.mouseRecorder = null; packetWriter.close(); - DevicePcmPlayerProvider.method855(); - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; } } - PacketWriter.mouseWheel = null; - if (WorldMapLabelSize.pcmPlayer0 != null) { - WorldMapLabelSize.pcmPlayer0.shutdown(); + GraphicsObject.method2121(); + SecureRandomFuture.mouseWheel = null; + if (WorldMapManager.pcmPlayer0 != null) { + WorldMapManager.pcmPlayer0.shutdown(); } - if (class43.pcmPlayer1 != null) { - class43.pcmPlayer1.shutdown(); + if (AbstractWorldMapData.pcmPlayer1 != null) { + AbstractWorldMapData.pcmPlayer1.shutdown(); } - WorldMapElement.method4470(); + class7.method104(); synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3150 != 0) { - ArchiveDiskActionHandler.field3150 = 1; + if (ArchiveDiskActionHandler.field3151 != 0) { + ArchiveDiskActionHandler.field3151 = 1; try { ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); @@ -2268,16 +1935,16 @@ public final class Client extends GameShell implements Usernamed { } } - if (WorldMapData_0.urlRequester != null) { - WorldMapData_0.urlRequester.close(); - WorldMapData_0.urlRequester = null; + if (WorldMapLabel.urlRequester != null) { + WorldMapLabel.urlRequester.close(); + WorldMapLabel.urlRequester = null; } try { JagexCache.JagexCache_dat2File.close(); - for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { - MilliClock.JagexCache_idxFiles[var4].close(); + for (int var4 = 0; var4 < InterfaceParent.idxCount; ++var4) { + PacketBufferNode.JagexCache_idxFiles[var4].close(); } JagexCache.JagexCache_idx255File.close(); @@ -2287,12 +1954,12 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-2" + signature = "(I)V", + garbageValue = "-277226112" ) - protected final void vmethod1478() { + protected final void vmethod1400() { } public final void init() { @@ -2326,164 +1993,530 @@ public final class Client extends GameShell implements Usernamed { worldProperties = Integer.parseInt(var2); break; case 6: - FriendLoginUpdate.clientLanguage = Language.method3711(Integer.parseInt(var2)); + IgnoreList.clientLanguage = Language.method3736(Integer.parseInt(var2)); break; case 7: - BuddyRankComparator.field1987 = class2.method31(Integer.parseInt(var2)); + class198.field2353 = Strings.method4219(Integer.parseInt(var2)); break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - GameShell.field477 = var2; + WorldMapData_0.field137 = var2; break; case 10: - class14.field102 = (StudioGame)WorldMapSection0.findEnumerated(MusicPatchNode.method3898(), Integer.parseInt(var2)); - if (StudioGame.oldscape == class14.field102) { - class192.loginType = LoginType.oldscape; + 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; } else { - class192.loginType = LoginType.field4029; + WorldMapIcon_0.loginType = LoginType.field4054; } break; case 12: worldId = Integer.parseInt(var2); break; case 14: - field672 = Integer.parseInt(var2); + KitDefinition.field3271 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - StructDefinition.field3307 = var2; + class201.field2390 = var2; } } } Scene.Scene_isLowDetail = false; isLowDetail = false; - NetSocket.worldHost = this.getCodeBase().getHost(); - String var11 = BuddyRankComparator.field1987.name; - byte var12 = 0; + Script.worldHost = this.getCodeBase().getHost(); + String var17 = class198.field2353.name; + byte var18 = 0; try { - JagexCache.idxCount = 21; - GrandExchangeOfferOwnWorldComparator.cacheGamebuild = var12; + InterfaceParent.idxCount = 21; + class8.cacheGamebuild = var18; try { - MilliClock.field2015 = System.getProperty("os.name"); - } catch (Exception var17) { - MilliClock.field2015 = "Unknown"; + SequenceDefinition.field3527 = System.getProperty("os.name"); + } catch (Exception var34) { + SequenceDefinition.field3527 = "Unknown"; } - class160.field1998 = MilliClock.field2015.toLowerCase(); + class171.field2016 = SequenceDefinition.field3527.toLowerCase(); try { - UserComparator4.userHomeDirectory = System.getProperty("user.home"); - if (UserComparator4.userHomeDirectory != null) { - UserComparator4.userHomeDirectory = UserComparator4.userHomeDirectory + "/"; + AbstractWorldMapData.userHomeDirectory = System.getProperty("user.home"); + if (AbstractWorldMapData.userHomeDirectory != null) { + AbstractWorldMapData.userHomeDirectory = AbstractWorldMapData.userHomeDirectory + "/"; } - } catch (Exception var16) { + } catch (Exception var33) { } try { - if (class160.field1998.startsWith("win")) { - if (UserComparator4.userHomeDirectory == null) { - UserComparator4.userHomeDirectory = System.getenv("USERPROFILE"); + if (class171.field2016.startsWith("win")) { + if (AbstractWorldMapData.userHomeDirectory == null) { + AbstractWorldMapData.userHomeDirectory = System.getenv("USERPROFILE"); } - } else if (UserComparator4.userHomeDirectory == null) { - UserComparator4.userHomeDirectory = System.getenv("HOME"); + } else if (AbstractWorldMapData.userHomeDirectory == null) { + AbstractWorldMapData.userHomeDirectory = System.getenv("HOME"); } - if (UserComparator4.userHomeDirectory != null) { - UserComparator4.userHomeDirectory = UserComparator4.userHomeDirectory + "/"; + if (AbstractWorldMapData.userHomeDirectory != null) { + AbstractWorldMapData.userHomeDirectory = AbstractWorldMapData.userHomeDirectory + "/"; } - } catch (Exception var15) { + } catch (Exception var32) { } - if (UserComparator4.userHomeDirectory == null) { - UserComparator4.userHomeDirectory = "~/"; + if (AbstractWorldMapData.userHomeDirectory == null) { + AbstractWorldMapData.userHomeDirectory = "~/"; } - ChatChannel.field1291 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", UserComparator4.userHomeDirectory, "/tmp/", ""}; - class42.field373 = new String[]{".jagex_cache_" + GrandExchangeOfferOwnWorldComparator.cacheGamebuild, ".file_store_" + GrandExchangeOfferOwnWorldComparator.cacheGamebuild}; + 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; - int var13; - label136: - for (var13 = 0; var13 < 4; ++var13) { - JagexCache.cacheDir = GrandExchangeOfferOwnWorldComparator.method1311("oldschool", var11, var13); - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); + 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; + } + } } - File[] var4 = JagexCache.cacheDir.listFiles(); - if (var4 == 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[] var5 = var4; - int var6 = 0; + File[] var43 = var40; + int var26 = 0; while (true) { - if (var6 >= var5.length) { - break label136; + if (var26 >= var43.length) { + break label276; } - File var7 = var5[var6]; + File var27 = var43[var26]; - boolean var8; + boolean var49; try { - RandomAccessFile var9 = new RandomAccessFile(var7, "rw"); - int var10 = var9.read(); - var9.seek(0L); - var9.write(var10); - var9.seek(0L); - var9.close(); - var8 = true; - } catch (Exception var14) { - var8 = false; + 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 (!var8) { + if (!var49) { + ++var19; break; } - ++var6; + ++var26; } } - class208.method4016(JagexCache.cacheDir); - class3.method52(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - MilliClock.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; - - for (var13 = 0; var13 < JagexCache.idxCount; ++var13) { - MilliClock.JagexCache_idxFiles[var13] = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.idx" + var13), "rw", 1048576L), 6000, 0); + File var39 = class92.cacheDir; + FileSystem.FileSystem_cacheDir = var39; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); } - } catch (Exception var18) { - class225.RunException_sendStackTrace((String)null, var18); + + 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); } - Username.client = this; + WorldMapSection1.client = this; RunException.clientType = clientType; - this.startThread(765, 503, 188); + this.startThread(765, 503, 189); } - } catch (RuntimeException var19) { - throw class218.newRunException(var19, "client.init(" + ')'); + } catch (RuntimeException var38) { + throw class51.newRunException(var38, "client.init(" + ')'); } } - @ObfuscatedName("ew") + @ObfuscatedName("eg") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1362908208" + signature = "(B)V", + garbageValue = "0" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = WorldMapDecorationType.method4187(); + long var2 = class217.currentTimeMillis(); + int var4 = (int)(var2 - NetCache.field3165); + NetCache.field3165 = var2; + if (var4 > 200) { + var4 = 200; + } + + NetCache.NetCache_loadTime += var4; + boolean var1; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + var1 = true; + } else if (NetCache.NetCache_socket == null) { + var1 = false; + } else { + try { + label243: { + if (NetCache.NetCache_loadTime > 30000) { + throw new IOException(); + } + + NetFileRequest var5; + Buffer var6; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var6 = new Buffer(4); + var6.writeByte(1); + var6.writeMedium((int)var5.key); + NetCache.NetCache_socket.write(var6.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var6 = new Buffer(4); + var6.writeByte(0); + var6.writeMedium((int)var5.key); + NetCache.NetCache_socket.write(var6.array, 0, 4); + var5.removeDual(); + NetCache.NetCache_pendingResponses.put(var5, var5.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; + } + + for (int var17 = 0; var17 < 100; ++var17) { + int var18 = NetCache.NetCache_socket.available(); + if (var18 < 0) { + throw new IOException(); + } + + if (var18 == 0) { + break; + } + + NetCache.NetCache_loadTime = 0; + byte var7 = 0; + if (NetCache.NetCache_currentResponse == null) { + var7 = 8; + } else if (NetCache.field3178 == 0) { + var7 = 1; + } + + int var8; + int var9; + int var10; + int var12; + byte[] var10000; + int var10001; + Buffer var25; + if (var7 > 0) { + var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var8 > var18) { + var8 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); + if (NetCache.field3163 != 0) { + for (var9 = 0; var9 < var8; ++var9) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; + var10000[var10001] ^= NetCache.field3163; + } + } + + var25 = NetCache.NetCache_responseHeaderBuffer; + var25.offset += var8; + if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { + break; + } + + if (NetCache.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var13 = (long)(var10 + (var9 << 16)); + NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); + GrandExchangeOfferOwnWorldComparator.field677 = true; + if (var15 == null) { + var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); + GrandExchangeOfferOwnWorldComparator.field677 = false; + } + + if (var15 == null) { + throw new IOException(); + } + + 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; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3178 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3178 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + NetCache.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; + } + + if (var9 > var18) { + var9 = var18; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); + if (NetCache.field3163 != 0) { + for (var10 = 0; var10 < var9; ++var10) { + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = var10 + NetCache.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3163; + } + } + + var25 = NetCache.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; + + 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(); + var19.loadIndex(var12, var20); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); + var10 = (int)NetCache.NetCache_crc.getValue(); + if (var10 != NetCache.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var23) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3163 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + var1 = false; + break label243; + } + + 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); + } + + NetCache.NetCache_currentResponse.remove(); + if (GrandExchangeOfferOwnWorldComparator.field677) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3178 = 0; + NetCache.NetCache_currentResponse = null; + NetCache.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3178 != 512) { + break; + } + + NetCache.field3178 = 0; + } + } + } + + var1 = true; + } + } catch (IOException var24) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var22) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + var1 = false; + } + } + if (!var1) { this.doCycleJs5Connect(); } @@ -2491,10 +2524,10 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("ed") + @ObfuscatedName("es") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "59" + signature = "(I)V", + garbageValue = "-1183665566" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { @@ -2509,123 +2542,66 @@ public final class Client extends GameShell implements Usernamed { return; } - field675 = 3000; + field709 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field675 + 1 <= 0) { + if (--field709 + 1 <= 0) { try { if (js5ConnectState == 0) { - TileItemPile.js5SocketTask = GameShell.taskHandler.newSocketTask(NetSocket.worldHost, WorldMapSection2.port3); + WorldMapManager.js5SocketTask = class227.taskHandler.newSocketTask(Script.worldHost, class280.port3); ++js5ConnectState; } if (js5ConnectState == 1) { - if (TileItemPile.js5SocketTask.status == 2) { + if (WorldMapManager.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (TileItemPile.js5SocketTask.status == 1) { + if (WorldMapManager.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - WorldMapIcon_0.js5Socket = Bounds.method6040((Socket)TileItemPile.js5SocketTask.result, 40000, 5000); + MusicPatchNode.js5Socket = Buffer.method5794((Socket)WorldMapManager.js5SocketTask.result, 40000, 5000); } else { - WorldMapIcon_0.js5Socket = new NetSocket((Socket)TileItemPile.js5SocketTask.result, GameShell.taskHandler, 5000); + MusicPatchNode.js5Socket = new NetSocket((Socket)WorldMapManager.js5SocketTask.result, class227.taskHandler, 5000); } Buffer var1 = new Buffer(5); var1.writeByte(15); - var1.writeInt(188); - WorldMapIcon_0.js5Socket.write(var1.array, 0, 5); + var1.writeInt(189); + MusicPatchNode.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - ServerBuild.field3111 = WorldMapIcon_0.currentTimeMillis(); + class58.field455 = class217.currentTimeMillis(); } if (js5ConnectState == 3) { - if (WorldMapIcon_0.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var5 = WorldMapIcon_0.js5Socket.readUnsignedByte(); - if (var5 != 0) { - this.js5Error(var5); + if (MusicPatchNode.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var2 = MusicPatchNode.js5Socket.readUnsignedByte(); + if (var2 != 0) { + this.js5Error(var2); return; } ++js5ConnectState; - } else if (WorldMapIcon_0.currentTimeMillis() - ServerBuild.field3111 > 30000L) { + } else if (class217.currentTimeMillis() - class58.field455 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - AbstractSocket var10 = WorldMapIcon_0.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; - TextureProvider.method2833(var2); - NetCache.NetCache_responseHeaderBuffer.offset = 0; - GrandExchangeEvent.NetCache_currentResponse = null; - VertexNormal.NetCache_responseArchiveBuffer = null; - NetCache.field3181 = 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.field3184 != 0) { - try { - Buffer var11 = new Buffer(4); - var11.writeByte(4); - var11.writeByte(NetCache.field3184); - var11.writeShort(0); - NetCache.NetCache_socket.write(var11.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - NetCache.NetCache_loadTime = 0; - NetCache.field3170 = WorldMapIcon_0.currentTimeMillis(); - TileItemPile.js5SocketTask = null; - WorldMapIcon_0.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; - } + GrandExchangeOfferUnitPriceComparator.method222(MusicPatchNode.js5Socket, gameState > 20); + WorldMapManager.js5SocketTask = null; + MusicPatchNode.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; } - } catch (IOException var9) { + } catch (IOException var3) { this.js5Error(-3); } @@ -2633,48 +2609,48 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("fl") + @ObfuscatedName("fk") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-52" + signature = "(II)V", + garbageValue = "-2003740384" ) @Export("js5Error") void js5Error(int var1) { - TileItemPile.js5SocketTask = null; - WorldMapIcon_0.js5Socket = null; + WorldMapManager.js5SocketTask = null; + MusicPatchNode.js5Socket = null; js5ConnectState = 0; - if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { - WorldMapSection2.port3 = port2; + if (WorldMapLabelSize.port1 == class280.port3) { + class280.port3 = GrandExchangeOfferAgeComparator.port2; } else { - WorldMapSection2.port3 = WorldMapLabelSize.port1; + class280.port3 = WorldMapLabelSize.port1; } ++js5Errors; - if (js5Errors < 2 || var1 != 7 && var1 != 9) { - if (js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { + if (gameState <= 5) { + this.error("js5connect_full"); gameState = 1000; - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - gameState = 1000; - } else { - field675 = 3000; - } + } else { + field709 = 3000; } - } else if (gameState <= 5) { - this.error("js5connect_full"); + } else if (js5Errors >= 2 && var1 == 6) { + this.error("js5connect_outofdate"); gameState = 1000; - } else { - field675 = 3000; + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + gameState = 1000; + } else { + field709 = 3000; + } } } - @ObfuscatedName("fz") + @ObfuscatedName("fi") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1666234502" + garbageValue = "931463513" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2683,88 +2659,89 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (ScriptEvent.secureRandom == null && (secureRandomFuture.isDone() || field679 > 250)) { - ScriptEvent.secureRandom = secureRandomFuture.get(); + if (MouseHandler.secureRandom == null && (secureRandomFuture.isDone() || field712 > 250)) { + MouseHandler.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (ScriptEvent.secureRandom != null) { + if (MouseHandler.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - NetFileRequest.socketTask = null; - field800 = false; - field679 = 0; + AbstractWorldMapIcon.socketTask = null; + field728 = false; + field712 = 0; loginState = 1; } } if (loginState == 1) { - if (NetFileRequest.socketTask == null) { - NetFileRequest.socketTask = GameShell.taskHandler.newSocketTask(NetSocket.worldHost, WorldMapSection2.port3); + if (AbstractWorldMapIcon.socketTask == null) { + AbstractWorldMapIcon.socketTask = class227.taskHandler.newSocketTask(Script.worldHost, class280.port3); } - if (NetFileRequest.socketTask.status == 2) { + if (AbstractWorldMapIcon.socketTask.status == 2) { throw new IOException(); } - if (NetFileRequest.socketTask.status == 1) { + if (AbstractWorldMapIcon.socketTask.status == 1) { if (useBufferedSocket) { - var1 = Bounds.method6040((Socket)NetFileRequest.socketTask.result, 40000, 5000); + var1 = Buffer.method5794((Socket)AbstractWorldMapIcon.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)NetFileRequest.socketTask.result, GameShell.taskHandler, 5000); + var1 = new NetSocket((Socket)AbstractWorldMapIcon.socketTask.result, class227.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - NetFileRequest.socketTask = null; + AbstractWorldMapIcon.socketTask = null; loginState = 2; } } + PacketBufferNode var4; if (loginState == 2) { packetWriter.clearBuffer(); - PacketBufferNode var4 = UserComparator5.method3488(); + var4 = UserComparator9.method3496(); var4.clientPacket = null; var4.clientPacketLength = 0; var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.field2310.id); + var4.packetBuffer.writeByte(LoginPacket.field2315.id); packetWriter.addNode(var4); packetWriter.flush(); var2.offset = 0; loginState = 3; } - boolean var14; - int var15; + boolean var13; + int var14; if (loginState == 3) { - if (WorldMapLabelSize.pcmPlayer0 != null) { - WorldMapLabelSize.pcmPlayer0.method2489(); + if (WorldMapManager.pcmPlayer0 != null) { + WorldMapManager.pcmPlayer0.method2537(); } - if (class43.pcmPlayer1 != null) { - class43.pcmPlayer1.method2489(); + if (AbstractWorldMapData.pcmPlayer1 != null) { + AbstractWorldMapData.pcmPlayer1.method2537(); } - var14 = true; + var13 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var14 = false; + var13 = false; } - if (var14) { - var15 = ((AbstractSocket)var1).readUnsignedByte(); - if (WorldMapLabelSize.pcmPlayer0 != null) { - WorldMapLabelSize.pcmPlayer0.method2489(); + if (var13) { + var14 = ((AbstractSocket)var1).readUnsignedByte(); + if (WorldMapManager.pcmPlayer0 != null) { + WorldMapManager.pcmPlayer0.method2537(); } - if (class43.pcmPlayer1 != null) { - class43.pcmPlayer1.method2489(); + if (AbstractWorldMapData.pcmPlayer1 != null) { + AbstractWorldMapData.pcmPlayer1.method2537(); } - if (var15 != 0) { - GameShell.getLoginError(var15); + if (var14 != 0) { + PlayerAppearance.getLoginError(var14); return; } @@ -2773,56 +2750,54 @@ public final class Client extends GameShell implements Usernamed { } } - int var33; + int var36; if (loginState == 4) { if (var2.offset < 8) { - var33 = ((AbstractSocket)var1).available(); - if (var33 > 8 - var2.offset) { - var33 = 8 - var2.offset; + var36 = ((AbstractSocket)var1).available(); + if (var36 > 8 - var2.offset) { + var36 = 8 - var2.offset; } - if (var33 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var33); - var2.offset += var33; + if (var36 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var36); + var2.offset += var36; } } if (var2.offset == 8) { var2.offset = 0; - WorldMapLabel.field250 = var2.readLong(); + ChatChannel.field1319 = var2.readLong(); loginState = 5; } } + int var7; + int var9; + int var15; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); PacketBuffer var3 = new PacketBuffer(500); - int[] var28 = new int[]{ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt()}; + int[] var27 = new int[]{MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt()}; var3.offset = 0; var3.writeByte(1); - var3.writeInt(var28[0]); - var3.writeInt(var28[1]); - var3.writeInt(var28[2]); - var3.writeInt(var28[3]); - var3.writeLong(WorldMapLabel.field250); + var3.writeInt(var27[0]); + var3.writeInt(var27[1]); + var3.writeInt(var27[2]); + var3.writeInt(var27[3]); + var3.writeLong(ChatChannel.field1319); if (gameState == 40) { - var3.writeInt(WorldMapSection1.field295[0]); - var3.writeInt(WorldMapSection1.field295[1]); - var3.writeInt(WorldMapSection1.field295[2]); - var3.writeInt(WorldMapSection1.field295[3]); + var3.writeInt(class105.field1345[0]); + var3.writeInt(class105.field1345[1]); + var3.writeInt(class105.field1345[2]); + var3.writeInt(class105.field1345[3]); } else { - var3.writeByte(field682.rsOrdinal()); - switch(field682.field1992) { + var3.writeByte(field715.rsOrdinal()); + switch(field715.field2014) { case 0: - case 3: - var3.writeMedium(Frames.field1885); - ++var3.offset; - break; - case 1: - LinkedHashMap var6 = WorldMapSection2.clientPreferences.parameters; + LinkedHashMap var6 = GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters; String var8 = Login.Login_username; - int var9 = var8.length(); + var9 = var8.length(); int var10 = 0; for (int var11 = 0; var11 < var9; ++var11) { @@ -2831,248 +2806,317 @@ public final class Client extends GameShell implements Usernamed { var3.writeInt((Integer)var6.get(var10)); break; + case 1: case 2: + var3.writeMedium(GraphicsObject.field1141); + ++var3.offset; + break; + case 3: var3.offset += 4; } - var3.writeByte(class313.field3815.rsOrdinal()); + var3.writeByte(class322.field3825.rsOrdinal()); var3.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class83.field1151, class83.field1150); - WorldMapSection1.field295 = var28; - PacketBufferNode var31 = UserComparator5.method3488(); - var31.clientPacket = null; - var31.clientPacketLength = 0; - var31.packetBuffer = new PacketBuffer(5000); - var31.packetBuffer.offset = 0; + 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; if (gameState == 40) { - var31.packetBuffer.writeByte(LoginPacket.field2313.id); + var33.packetBuffer.writeByte(LoginPacket.field2313.id); } else { - var31.packetBuffer.writeByte(LoginPacket.field2308.id); + var33.packetBuffer.writeByte(LoginPacket.field2317.id); } - var31.packetBuffer.writeShort(0); - int var7 = var31.packetBuffer.offset; - var31.packetBuffer.writeInt(188); - var31.packetBuffer.writeInt(1); - var31.packetBuffer.writeByte(clientType); - var31.packetBuffer.writeBytes(var3.array, 0, var3.offset); - int var16 = var31.packetBuffer.offset; - var31.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var31.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var31.packetBuffer.writeShort(Username.canvasWidth); - var31.packetBuffer.writeShort(WorldMapData_1.canvasHeight); - PacketBuffer var17 = var31.packetBuffer; - int var12; + 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; if (randomDatData != null) { - var17.writeBytes(randomDatData, 0, randomDatData.length); + var16.writeBytes(randomDatData, 0, randomDatData.length); } else { - byte[] var18 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var18); - - for (var12 = 0; var12 < 24 && var18[var12] == 0; ++var12) { - } - - if (var12 >= 24) { - throw new IOException(); - } - } catch (Exception var25) { - for (int var13 = 0; var13 < 24; ++var13) { - var18[var13] = -1; - } - } - - var17.writeBytes(var18, 0, var18.length); + byte[] var17 = GraphicsObject.method2120(); + var16.writeBytes(var17, 0, var17.length); } - var31.packetBuffer.writeStringCp1252NullTerminated(GameShell.field477); - var31.packetBuffer.writeInt(field672); - Buffer var20 = new Buffer(NetSocket.platformInfo.size()); - NetSocket.platformInfo.write(var20); - var31.packetBuffer.writeBytes(var20.array, 0, var20.array.length); - var31.packetBuffer.writeByte(clientType); - var31.packetBuffer.writeInt(0); - var31.packetBuffer.writeInt(GrandExchangeEvent.archive0.hash); - var31.packetBuffer.writeInt(class65.archive1.hash); - var31.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive2.hash); - var31.packetBuffer.writeInt(class267.archive3.hash); - var31.packetBuffer.writeInt(archive4.hash); - var31.packetBuffer.writeInt(NetSocket.archive5.hash); - var31.packetBuffer.writeInt(MouseHandler.archive6.hash); - var31.packetBuffer.writeInt(BuddyRankComparator.archive7.hash); - var31.packetBuffer.writeInt(UserComparator8.archive8.hash); - var31.packetBuffer.writeInt(GrandExchangeOfferNameComparator.archive9.hash); - var31.packetBuffer.writeInt(HealthBar.archive10.hash); - var31.packetBuffer.writeInt(GrandExchangeOffer.archive11.hash); - var31.packetBuffer.writeInt(MilliClock.archive12.hash); - var31.packetBuffer.writeInt(MouseHandler.archive13.hash); - var31.packetBuffer.writeInt(class189.archive14.hash); - var31.packetBuffer.writeInt(WorldMapSection1.archive15.hash); - var31.packetBuffer.writeInt(0); - var31.packetBuffer.writeInt(archive17.hash); - var31.packetBuffer.writeInt(UserComparator2.archive18.hash); - var31.packetBuffer.writeInt(Clock.archive19.hash); - var31.packetBuffer.writeInt(SecureRandomCallable.archive20.hash); - var31.packetBuffer.xteaEncrypt(var28, var16, var31.packetBuffer.offset); - var31.packetBuffer.writeLengthShort(var31.packetBuffer.offset - var7); - packetWriter.addNode(var31); + 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); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var28); - int[] var35 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var27); + int[] var18 = new int[4]; - for (var12 = 0; var12 < 4; ++var12) { - var35[var12] = var28[var12] + 50; + for (int var12 = 0; var12 < 4; ++var12) { + var18[var12] = var27[var12] + 50; } - var2.newIsaacCipher(var35); + var2.newIsaacCipher(var18); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var33 = ((AbstractSocket)var1).readUnsignedByte(); - if (var33 == 21 && gameState == 20) { - loginState = 9; - } else if (var33 == 2) { - loginState = 11; - } else if (var33 == 15 && gameState == 40) { + var36 = ((AbstractSocket)var1).readUnsignedByte(); + if (var36 == 21 && gameState == 20) { + loginState = 12; + } else if (var36 == 2) { + loginState = 14; + } else if (var36 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; - loginState = 16; - } else if (var33 == 64) { - loginState = 7; - } else if (var33 == 23 && field680 < 1) { - ++field680; + loginState = 19; + } else if (var36 == 64) { + loginState = 10; + } else if (var36 == 23 && field713 < 1) { + ++field713; loginState = 0; + } else if (var36 == 29) { + loginState = 17; } else { - if (var33 != 29) { - GameShell.getLoginError(var33); + if (var36 != 69) { + PlayerAppearance.getLoginError(var36); return; } - loginState = 14; + loginState = 7; } } - if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - WorldMapIcon_0.field148 = ((AbstractSocket)var1).readUnsignedByte(); + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + MilliClock.field2026 = var2.readUnsignedShort(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapIcon_0.field148) { - ((AbstractSocket)var1).read(var2.array, 0, WorldMapIcon_0.field148); + if (loginState == 8 && ((AbstractSocket)var1).available() >= MilliClock.field2026) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, var2.offset, MilliClock.field2026); + class7[] var25 = new class7[]{class7.field34}; + class7 var28 = var25[var2.readUnsignedByte()]; + + try { + switch(var28.field30) { + case 0: + class5 var5 = new class5(); + this.field719 = new class9(var2, var5); + loginState = 9; + break; + default: + throw new IllegalArgumentException(); + } + } catch (Exception var23) { + PlayerAppearance.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); + 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); + packetWriter.flush(); + this.field718 = null; + loginState = 6; + } + + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { + class52.field407 = ((AbstractSocket)var1).readUnsignedByte(); + loginState = 11; + } + + if (loginState == 11 && ((AbstractSocket)var1).available() >= class52.field407) { + ((AbstractSocket)var1).read(var2.array, 0, class52.field407); var2.offset = 0; loginState = 6; } - if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { - field681 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - loginState = 10; + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { + field714 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + loginState = 13; } - if (loginState == 10) { - field679 = 0; - Tiles.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field681 / 60 + " seconds."); - if (--field681 <= 0) { + 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) { loginState = 0; } } else { - if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - class189.field2353 = ((AbstractSocket)var1).readUnsignedByte(); - loginState = 12; + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { + GrandExchangeEvents.field71 = ((AbstractSocket)var1).readUnsignedByte(); + loginState = 15; } - if (loginState == 12 && ((AbstractSocket)var1).available() >= class189.field2353) { - var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; + if (loginState == 15 && ((AbstractSocket)var1).available() >= GrandExchangeEvents.field71) { + var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var34 = false; - if (var14) { - var15 = var2.readByteIsaac() << 24; - var15 |= var2.readByteIsaac() << 16; - var15 |= var2.readByteIsaac() << 8; - var15 |= var2.readByteIsaac(); - int var21 = Buddy.method5234(Login.Login_username); - if (WorldMapSection2.clientPreferences.parameters.size() >= 10 && !WorldMapSection2.clientPreferences.parameters.containsKey(var21)) { - Iterator var32 = WorldMapSection2.clientPreferences.parameters.entrySet().iterator(); - var32.next(); - var32.remove(); - } + boolean var37 = 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; - WorldMapSection2.clientPreferences.parameters.put(var21, var15); + 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; + } } if (Login_isUsernameRemembered) { - WorldMapSection2.clientPreferences.rememberedUsername = Login.Login_username; + GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = Login.Login_username; } else { - WorldMapSection2.clientPreferences.rememberedUsername = null; + GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = null; } - WorldMapData_1.savePreferences(); + WorldMapArea.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field763 = ((AbstractSocket)var1).readUnsignedByte(); + field798 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var5 = Occluder.ServerPacket_values(); - int var22 = var2.readSmartByteShortIsaac(); - if (var22 < 0 || var22 >= var5.length) { - throw new IOException(var22 + " " + var2.offset); + ServerPacket[] var29 = KeyHandler.ServerPacket_values(); + int var20 = var2.readSmartByteShortIsaac(); + if (var20 < 0 || var20 >= var29.length) { + throw new IOException(var20 + " " + var2.offset); } - packetWriter.serverPacket = var5[var22]; + packetWriter.serverPacket = var29[var20]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - class47.method857(Username.client, "zap"); - } catch (Throwable var24) { + class56.method950(WorldMapSection1.client, "zap"); + } catch (Throwable var22) { } - loginState = 13; + loginState = 16; } - if (loginState == 13) { + if (loginState == 16) { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5047(); - class2.method32(); - MenuAction.updatePlayer(var2); - SecureRandomCallable.field530 = -1; - WorldMapLabel.loadRegions(false, var2); + timer.method5045(); + MusicPatchPcmStream.method4004(); + TriBool.updatePlayer(var2); + class69.field585 = -1; + GameObject.loadRegions(false, var2); packetWriter.serverPacket = null; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) { + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - FontName.field3650 = var2.readUnsignedShort(); - loginState = 15; + class7.field33 = var2.readUnsignedShort(); + loginState = 18; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= FontName.field3650) { + if (loginState == 18 && ((AbstractSocket)var1).available() >= class7.field33) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, FontName.field3650); + ((AbstractSocket)var1).read(var2.array, 0, class7.field33); var2.offset = 0; - String var27 = var2.readStringCp1252NullTerminated(); - String var29 = var2.readStringCp1252NullTerminated(); + String var26 = var2.readStringCp1252NullTerminated(); String var30 = var2.readStringCp1252NullTerminated(); - Tiles.setLoginResponseString(var27, var29, var30); - Projectile.updateGameState(10); + String var31 = var2.readStringCp1252NullTerminated(); + HealthBarUpdate.setLoginResponseString(var26, var30, var31); + MouseRecorder.updateGameState(10); } - if (loginState == 16) { + if (loginState != 19) { + ++field712; + if (field712 > 2000) { + if (field713 < 1) { + if (class280.port3 == WorldMapLabelSize.port1) { + class280.port3 = GrandExchangeOfferAgeComparator.port2; + } else { + class280.port3 = WorldMapLabelSize.port1; + } + + ++field713; + loginState = 0; + } else { + PlayerAppearance.getLoginError(-3); + } + } + } else { if (packetWriter.serverPacketLength == -1) { if (((AbstractSocket)var1).available() < 2) { return; @@ -3086,53 +3130,75 @@ public final class Client extends GameShell implements Usernamed { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; - var33 = packetWriter.serverPacketLength; - timer.method5046(); - MouseHandler.method1110(); - MenuAction.updatePlayer(var2); - if (var33 != var2.offset) { - throw new RuntimeException(); - } - } - } else { - ++field679; - if (field679 > 2000) { - if (field680 < 1) { - if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { - WorldMapSection2.port3 = port2; - } else { - WorldMapSection2.port3 = WorldMapLabelSize.port1; - } + var36 = packetWriter.serverPacketLength; + timer.method5047(); + packetWriter.clearBuffer(); + packetWriter.packetBuffer.offset = 0; + packetWriter.serverPacket = null; + packetWriter.field1334 = null; + packetWriter.field1329 = null; + packetWriter.field1339 = null; + packetWriter.serverPacketLength = 0; + packetWriter.field1338 = 0; + rebootTimer = 0; + AbstractByteArrayCopier.method4023(); + minimapState = 0; + destinationX = 0; - ++field680; - loginState = 0; - } else { - GameShell.getLoginError(-3); + for (var14 = 0; var14 < 2048; ++var14) { + players[var14] = null; + } + + ByteArrayPool.localPlayer = null; + + for (var14 = 0; var14 < npcs.length; ++var14) { + NPC var32 = npcs[var14]; + if (var32 != null) { + var32.targetIndex = -1; + var32.false0 = false; + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); + MouseRecorder.updateGameState(30); + + for (var14 = 0; var14 < 100; ++var14) { + field679[var14] = true; + } + + var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, packetWriter.isaacCipher); + var4.packetBuffer.writeByte(class74.getWindowedMode()); + var4.packetBuffer.writeShort(WorldMapLabel.canvasWidth); + var4.packetBuffer.writeShort(Varps.canvasHeight); + packetWriter.addNode(var4); + TriBool.updatePlayer(var2); + if (var36 != var2.offset) { + throw new RuntimeException(); } } } } } - } catch (IOException var26) { - if (field680 < 1) { - if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { - WorldMapSection2.port3 = port2; + } catch (IOException var24) { + if (field713 < 1) { + if (class280.port3 == WorldMapLabelSize.port1) { + class280.port3 = GrandExchangeOfferAgeComparator.port2; } else { - WorldMapSection2.port3 = WorldMapLabelSize.port1; + class280.port3 = WorldMapLabelSize.port1; } - ++field680; + ++field713; loginState = 0; } else { - GameShell.getLoginError(-2); + PlayerAppearance.getLoginError(-2); } } } - @ObfuscatedName("fe") + @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "14" + signature = "(I)V", + garbageValue = "1428106045" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3144,909 +3210,704 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field800) { - field800 = false; - WorldMapIcon_1.method308(); + if (field728) { + field728 = false; + VertexNormal.method3093(); } else { if (!isMenuOpen) { - class96.addCancelMenuEntry(); + Tile.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1363(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1524(packetWriter); ++var1) { } if (gameState == 30) { - int var2; - PacketBufferNode var14; - while (FaceNormal.method3334()) { - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2235, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - Messages.performReflectionCheck(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class105.reflectionChecks.last(); + boolean var31; + if (var2 == null) { + var31 = false; + } else { + var31 = true; + } - if (timer.field3569) { - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2293, 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.method5057(); - } + 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(); + } - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - synchronized(class16.mouseRecorder.lock) { - if (!field922) { - class16.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class16.mouseRecorder.index >= 40) { - PacketBufferNode var15 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + synchronized(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; - for (var7 = 0; var7 < class16.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = class16.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } - - var9 = class16.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } - - if (var9 != field657 || var8 != field912) { - if (var15 == null) { - var15 = TilePaint.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var3 = var15.packetBuffer.offset; - PacketBuffer var10000 = var15.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; - } - - if (-1L != field745) { - var10 = var9 - field657; - var11 = var8 - field912; - var12 = (int)((class16.mouseRecorder.millis[var7] - field745) / 20L); - var5 = (int)((long)var5 + (class16.mouseRecorder.millis[var7] - field745) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; - } - - field657 = var9; - field912 = 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); + 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; } - } 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); + + var9 = MidiPcmStream.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } + + 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 (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; + } + + 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); + } + } + + ++var6; + field875 = MidiPcmStream.mouseRecorder.millis[var7]; } } - ++var6; - field745 = class16.mouseRecorder.millis[var7]; + if (var32 != null) { + var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); + var7 = var32.packetBuffer.offset; + var32.packetBuffer.offset = var3; + var32.packetBuffer.writeByte(var5 / var6); + var32.packetBuffer.writeByte(var5 % var6); + var32.packetBuffer.offset = var7; + packetWriter.addNode(var32); + } + + if (var4 >= MidiPcmStream.mouseRecorder.index) { + MidiPcmStream.mouseRecorder.index = 0; + } 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); + } } } - 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; + 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; + } + + field904 = var20; + var15.packetBuffer.method5616((int)var22); + var15.packetBuffer.writeByte(KeyHandler.field432[var5]); + } + + var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var16); packetWriter.addNode(var15); } - if (var4 >= class16.mouseRecorder.index) { - class16.mouseRecorder.index = 0; - } else { - MouseRecorder var44 = class16.mouseRecorder; - var44.index -= var4; - System.arraycopy(class16.mouseRecorder.xs, var4, class16.mouseRecorder.xs, 0, class16.mouseRecorder.index); - System.arraycopy(class16.mouseRecorder.ys, var4, class16.mouseRecorder.ys, 0, class16.mouseRecorder.index); - System.arraycopy(class16.mouseRecorder.millis, var4, class16.mouseRecorder.millis, 0, class16.mouseRecorder.index); - } - } - } - - 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; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > WorldMapData_1.canvasHeight) { - var3 = WorldMapData_1.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > Username.canvasWidth) { - var4 = Username.canvasWidth; - } - - var5 = (int)var16; - PacketBufferNode var18 = TilePaint.getPacketBufferNode(ClientPacket.field2275, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); - } - - if (KeyHandler.field405 > 0) { - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2286, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var2 = var14.packetBuffer.offset; - long var19 = WorldMapIcon_0.currentTimeMillis(); - - for (var5 = 0; var5 < KeyHandler.field405; ++var5) { - long var21 = var19 - field702; - if (var21 > 16777215L) { - var21 = 16777215L; + if (field764 > 0) { + --field764; } - field702 = var19; - var14.packetBuffer.writeByte(KeyHandler.field404[var5]); - var14.packetBuffer.method5619((int)var21); - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } - - if (field729 > 0) { - --field729; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field730 = true; - } - - if (field730 && field729 <= 0) { - field729 = 20; - field730 = false; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2208, packetWriter.isaacCipher); - var14.packetBuffer.method5787(camAngleY); - var14.packetBuffer.writeShortLE(camAngleX); - packetWriter.addNode(var14); - } - - if (GrandExchangeOfferTotalQuantityComparator.hasFocus && !hadFocus) { - hadFocus = true; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2210, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); - } - - if (!GrandExchangeOfferTotalQuantityComparator.hasFocus && hadFocus) { - hadFocus = false; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2210, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); - } - - if (WorldMapIcon_0.worldMap != null) { - WorldMapIcon_0.worldMap.method6499(); - } - - Canvas.method861(); - if (Clock.Client_plane != field704) { - field704 = Clock.Client_plane; - var1 = Clock.Client_plane; - int[] var36 = WorldMapRectangle.sceneMinimapSprite.pixels; - var3 = var36.length; - - for (var4 = 0; var4 < var3; ++var4) { - var36[var4] = 0; - } - - for (var4 = 1; var4 < 103; ++var4) { - var5 = (103 - var4) * 2048 + 24628; - - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { - ServerBuild.scene.drawTileMinimap(var36, var5, 512, var1, var6, var4); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { - ServerBuild.scene.drawTileMinimap(var36, var5, 512, var1 + 1, var6, var4); - } - - var5 += 4; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field765 = true; } - } - var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - WorldMapRectangle.sceneMinimapSprite.setRaster(); - - for (var6 = 1; var6 < 103; ++var6) { - for (var7 = 1; var7 < 103; ++var7) { - if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { - RouteStrategy.drawObject(var1, var7, var6, var4, var5); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { - RouteStrategy.drawObject(var1 + 1, var7, var6, var4, var5); - } + 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); } - } - mapIconCount = 0; + if (GameShell.hasFocus && !hadFocus) { + hadFocus = true; + var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2261, packetWriter.isaacCipher); + var15.packetBuffer.writeByte(1); + packetWriter.addNode(var15); + } - for (var6 = 0; var6 < 104; ++var6) { - for (var7 = 0; var7 < 104; ++var7) { - long var23 = ServerBuild.scene.getFloorDecorationTag(Clock.Client_plane, var6, var7); - if (0L != var23) { - var10 = GrandExchangeEvents.Entity_unpackID(var23); - var11 = Occluder.getObjectDefinition(var10).mapIconId; - if (var11 >= 0) { - mapIcons[mapIconCount] = PacketBufferNode.WorldMapElement_get(var11).getSpriteBool(false); - mapIconXs[mapIconCount] = var6; - mapIconYs[mapIconCount] = var7; - ++mapIconCount; + 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(); } - } - } - } - - DevicePcmPlayerProvider.rasterProvider.apply(); - } - - if (gameState == 30) { - for (PendingSpawn var34 = (PendingSpawn)pendingSpawns.last(); var34 != null; var34 = (PendingSpawn)pendingSpawns.previous()) { - if (var34.hitpoints > 0) { - --var34.hitpoints; - } - - if (var34.hitpoints == 0) { - if (var34.objectId < 0 || WorldMapData_0.method187(var34.objectId, var34.field924)) { - WorldMapSection0.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.objectId, var34.field935, var34.field924); - var34.remove(); - } - } else { - if (var34.delay > 0) { - --var34.delay; - } - - if (var34.delay == 0 && var34.x >= 1 && var34.y >= 1 && var34.x <= 102 && var34.y <= 102 && (var34.id < 0 || WorldMapData_0.method187(var34.id, var34.field933))) { - WorldMapSection0.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.id, var34.orientation, var34.field933); - var34.delay = -1; - if (var34.id == var34.objectId && var34.objectId == -1) { - var34.remove(); - } else if (var34.id == var34.objectId && var34.field935 == var34.orientation && var34.field924 == var34.field933) { - var34.remove(); + } else { + if (var37.delay > 0) { + --var37.delay; } - } - } - } - class222.method4192(); - ++packetWriter.field1299; - if (packetWriter.field1299 > 750) { - WorldMapIcon_1.method308(); - } else { - Entity.method3332(); - WorldMapSprite.method434(); - int[] var35 = Players.Players_indices; - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - Player var25 = players[var35[var2]]; - if (var25 != null && var25.overheadTextCyclesRemaining > 0) { - --var25.overheadTextCyclesRemaining; - if (var25.overheadTextCyclesRemaining == 0) { - var25.overheadText = null; + 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(); + } } } } - for (var2 = 0; var2 < npcCount; ++var2) { - var3 = npcIndices[var2]; - NPC var26 = npcs[var3]; - if (var26 != null && var26.overheadTextCyclesRemaining > 0) { - --var26.overheadTextCyclesRemaining; - if (var26.overheadTextCyclesRemaining == 0) { - var26.overheadText = null; - } + 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); } } - ++field707; + for (var1 = 0; var1 < npcCount; ++var1) { + var16 = npcIndices[var1]; + NPC var25 = npcs[var16]; + if (var25 != null) { + class41.updateActorSequence(var25, var25.definition.size); + } + } + + WorldMapRegion.method630(); + ++field741; if (mouseCrossColor != 0) { - mouseCrossState = mouseCrossState * 400 + 400; - if (mouseCrossState * 20 >= 400) { + mouseCrossState += 20; + if (mouseCrossState >= 400) { mouseCrossColor = 0; } } - if (Skeleton.field1793 != null) { - ++field751; - if (field751 >= 15) { - NPCDefinition.invalidateWidget(Skeleton.field1793); - Skeleton.field1793 = null; + if (WorldMapID.field307 != null) { + ++field786; + if (field786 >= 15) { + ItemContainer.invalidateWidget(WorldMapID.field307); + WorldMapID.field307 = null; } } - Widget var37 = GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1; - Widget var38 = VarbitDefinition.field3296; - GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = null; - VarbitDefinition.field3296 = null; + Widget var38 = class9.mousedOverWidgetIf1; + Widget var34 = Language.field2368; + class9.mousedOverWidgetIf1 = null; + Language.field2368 = null; draggedOnWidget = null; - field827 = false; - field824 = false; - field762 = 0; + field861 = false; + field732 = false; + field901 = 0; - while (SoundSystem.isKeyDown() && field762 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && RouteStrategy.field2102 == 66) { - String var39 = Skeleton.method3153(); - Username.client.clipboardSetString(var39); - } else if (oculusOrbState != 1 || class51.field432 <= 0) { - field869[field762] = RouteStrategy.field2102; - field868[field762] = class51.field432; - ++field762; + while (class22.isKeyDown() && field901 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class3.field16 == 66) { + String var42 = ""; + + Message var39; + for (Iterator var26 = Messages.Messages_hashTable.iterator(); var26.hasNext(); var42 = var42 + var39.sender + ':' + var39.text + '\n') { + var39 = (Message)var26.next(); + } + + WorldMapSection1.client.clipboardSetString(var42); + } else if (oculusOrbState != 1 || Coord.field2531 <= 0) { + field872[field901] = class3.field16; + field902[field901] = Coord.field2531; + ++field901; } } - if (FloorOverlayDefinition.method4835() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var3 = class192.localPlayer.plane - mouseWheelRotation; - if (var3 < 0) { - var3 = 0; - } else if (var3 > 3) { - var3 = 3; + boolean var35 = staffModLevel >= 2; + if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = ByteArrayPool.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { + var4 = 0; + } else if (var4 > 3) { + var4 = 3; } - if (var3 != class192.localPlayer.plane) { - WorldMapRegion.method563(class192.localPlayer.pathX[0] + Messages.baseX * 64, class192.localPlayer.pathY[0] + Language.baseY * 64, var3, false); + if (var4 != ByteArrayPool.localPlayer.plane) { + GrandExchangeOfferWorldComparator.method148(ByteArrayPool.localPlayer.pathX[0] + class69.baseX, ByteArrayPool.localPlayer.pathY[0] + class89.baseY, var4, false); } mouseWheelRotation = 0; } if (rootInterface != -1) { - WorldMapDecoration.updateRootInterface(rootInterface, 0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight, 0, 0); + class2.updateRootInterface(rootInterface, 0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var27; - ScriptEvent var40; - Widget var41; + Widget var40; + ScriptEvent var43; + Widget var45; do { - var40 = (ScriptEvent)field846.removeLast(); - if (var40 == null) { + var43 = (ScriptEvent)field727.removeLast(); + if (var43 == null) { while (true) { do { - var40 = (ScriptEvent)field847.removeLast(); - if (var40 == null) { + var43 = (ScriptEvent)field919.removeLast(); + if (var43 == null) { while (true) { do { - var40 = (ScriptEvent)scriptEvents.removeLast(); - if (var40 == null) { + var43 = (ScriptEvent)scriptEvents.removeLast(); + if (var43 == null) { this.menu(); - if (WorldMapIcon_0.worldMap != null) { - WorldMapIcon_0.worldMap.method6371(Clock.Client_plane, Messages.baseX * 64 + (class192.localPlayer.x >> 7), Language.baseY * 64 + (class192.localPlayer.y >> 7), false); - WorldMapIcon_0.worldMap.loadCache(); - } - + WorldMapArea.method508(); if (clickedWidget != null) { - this.method1541(); + this.method1420(); } - PacketBufferNode var43; - if (class185.dragInventoryWidget != null) { - NPCDefinition.invalidateWidget(class185.dragInventoryWidget); + if (class236.dragInventoryWidget != null) { + ItemContainer.invalidateWidget(class236.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field757) { - if (FloorDecoration.field1604 == class185.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { - Widget var42 = class185.dragInventoryWidget; - byte var31 = 0; - if (field811 == 1 && var42.contentType == 206) { - var31 = 1; + 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 (var42.itemIds[dragItemSlotDestination] <= 0) { - var31 = 0; + if (var44.itemIds[dragItemSlotDestination] <= 0) { + var36 = 0; } - if (FriendLoginUpdate.method5326(WorldMapIcon_0.getWidgetClickMask(var42))) { - var5 = dragItemSlotSource; - var6 = dragItemSlotDestination; - var42.itemIds[var6] = var42.itemIds[var5]; - var42.itemQuantities[var6] = var42.itemQuantities[var5]; - var42.itemIds[var5] = -1; - var42.itemQuantities[var5] = 0; - } else if (var31 == 1) { - var5 = dragItemSlotSource; - var6 = dragItemSlotDestination; + if (MilliClock.method3560(ScriptEvent.getWidgetClickMask(var44))) { + 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) { + var6 = dragItemSlotSource; + var7 = dragItemSlotDestination; - while (var6 != var5) { - if (var5 > var6) { - var42.swapItems(var5 - 1, var5); - --var5; - } else if (var5 < var6) { - var42.swapItems(var5 + 1, var5); - ++var5; + while (var6 != var7) { + if (var6 > var7) { + var44.swapItems(var6 - 1, var6); + --var6; + } else if (var6 < var7) { + var44.swapItems(var6 + 1, var6); + ++var6; } } } else { - var42.swapItems(dragItemSlotDestination, dragItemSlotSource); + var44.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var43 = TilePaint.getPacketBufferNode(ClientPacket.field2219, packetWriter.isaacCipher); - var43.packetBuffer.method5787(dragItemSlotSource); - var43.packetBuffer.method5604(var31); - var43.packetBuffer.method5787(dragItemSlotDestination); - var43.packetBuffer.method5624(class185.dragInventoryWidget.id); - packetWriter.addNode(var43); + 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); } } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(draggedWidgetX, draggedWidgetY); } else if (menuOptionsCount > 0) { - GrandExchangeOfferTotalQuantityComparator.method105(draggedWidgetX, draggedWidgetY); + 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; } - field751 = 10; + field786 = 10; MouseHandler.MouseHandler_lastButton = 0; - class185.dragInventoryWidget = null; + class236.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)) { - field757 = true; + field887 = true; } } - if (Scene.method3321()) { - var3 = Scene.Scene_selectedX; - var4 = Scene.Scene_selectedY; - var43 = TilePaint.getPacketBufferNode(ClientPacket.field2207, packetWriter.isaacCipher); - var43.packetBuffer.writeByte(5); - var43.packetBuffer.writeShort(Language.baseY * 64 + var4); - var43.packetBuffer.method5787(Messages.baseX * 64 + var3); - var43.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.addNode(var43); - Scene.method3279(); + if (Scene.method3215()) { + 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(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var3; - destinationY = var4; + destinationX = var4; + destinationY = var5; } - if (var37 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) { - if (var37 != null) { - NPCDefinition.invalidateWidget(var37); - } - - if (GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 != null) { - NPCDefinition.invalidateWidget(GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1); - } - } - - if (var38 != VarbitDefinition.field3296 && field796 == field797) { + if (var38 != class9.mousedOverWidgetIf1) { if (var38 != null) { - NPCDefinition.invalidateWidget(var38); + ItemContainer.invalidateWidget(var38); } - if (VarbitDefinition.field3296 != null) { - NPCDefinition.invalidateWidget(VarbitDefinition.field3296); + if (class9.mousedOverWidgetIf1 != null) { + ItemContainer.invalidateWidget(class9.mousedOverWidgetIf1); } } - if (VarbitDefinition.field3296 != null) { - if (field796 < field797) { - ++field796; - if (field796 == field797) { - NPCDefinition.invalidateWidget(VarbitDefinition.field3296); - } - } - } else if (field796 > 0) { - --field796; - } - - if (oculusOrbState == 0) { - var3 = class192.localPlayer.x; - var4 = class192.localPlayer.y; - if (PendingSpawn.oculusOrbFocalPointX - var3 < -500 || PendingSpawn.oculusOrbFocalPointX - var3 > 500 || Skeleton.oculusOrbFocalPointY - var4 < -500 || Skeleton.oculusOrbFocalPointY - var4 > 500) { - PendingSpawn.oculusOrbFocalPointX = var3; - Skeleton.oculusOrbFocalPointY = var4; + if (var34 != Language.field2368 && field871 == field832) { + if (var34 != null) { + ItemContainer.invalidateWidget(var34); } - if (var3 != PendingSpawn.oculusOrbFocalPointX) { - PendingSpawn.oculusOrbFocalPointX += (var3 - PendingSpawn.oculusOrbFocalPointX) / 16; - } - - if (var4 != Skeleton.oculusOrbFocalPointY) { - Skeleton.oculusOrbFocalPointY += (var4 - Skeleton.oculusOrbFocalPointY) / 16; - } - - var5 = PendingSpawn.oculusOrbFocalPointX >> 7; - var6 = Skeleton.oculusOrbFocalPointY >> 7; - var7 = WorldMapSectionType.getTileHeight(PendingSpawn.oculusOrbFocalPointX, Skeleton.oculusOrbFocalPointY, Clock.Client_plane); - var8 = 0; - if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { - for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - var11 = Clock.Client_plane; - if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { - ++var11; - } - - var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; - if (var12 > var8) { - var8 = var12; - } - } - } - } - - var9 = var8 * 192; - if (var9 > 98048) { - var9 = 98048; - } - - if (var9 < 32768) { - var9 = 32768; - } - - if (var9 > field818) { - field818 += (var9 - field818) / 24; - } else if (var9 < field818) { - field818 += (var9 - field818) / 80; - } - - WorldMapSectionType.field166 = WorldMapSectionType.getTileHeight(class192.localPlayer.x, class192.localPlayer.y, Clock.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - PrivateChatMode.method5952(); - 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; - } - - var5 = 0; - if (var32 >= 0 || var33 != 0) { - var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; - var5 *= 16; - field723 = var32; - field724 = var33; - } - - if (field647 < var5) { - field647 += var5 / 8; - if (field647 > var5) { - field647 = var5; - } - } else if (field647 > var5) { - field647 = field647 * 9 / 10; - } - - if (field647 > 0) { - var6 = field647 / 16; - if (field723 >= 0) { - var3 = field723 - FriendSystem.cameraYaw & 2047; - var7 = Rasterizer3D.Rasterizer3D_sine[var3]; - var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; - PendingSpawn.oculusOrbFocalPointX += var7 * var6 / 65536; - Skeleton.oculusOrbFocalPointY += var8 * var6 / 65536; - } - - if (field724 != 0) { - WorldMapSectionType.field166 += var6 * field724; - if (WorldMapSectionType.field166 > 0) { - WorldMapSectionType.field166 = 0; - } - } - } else { - field723 = -1; - field724 = -1; - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - packetWriter.addNode(TilePaint.getPacketBufferNode(ClientPacket.field2274, packetWriter.isaacCipher)); - oculusOrbState = 0; + if (Language.field2368 != null) { + ItemContainer.invalidateWidget(Language.field2368); } } - if (MouseHandler.MouseHandler_currentButton == 4 && ArchiveLoader.mouseCam) { - var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var3 * 2; - mouseCamClickedY = var3 != -1 && var3 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y; - var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var4 * 2; - mouseCamClickedX = var4 != -1 && var4 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { - camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; + if (Language.field2368 != null) { + if (field871 < field832) { + ++field871; + if (field832 == field871) { + ItemContainer.invalidateWidget(Language.field2368); + } } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { - camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; - } - - mouseCamClickedY = MouseHandler.MouseHandler_y; - mouseCamClickedX = MouseHandler.MouseHandler_x; - } - - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; - } - - if (camAngleX > 383) { - camAngleX = 383; + } else if (field871 > 0) { + --field871; } + Tile.method2961(); if (isCameraLocked) { - var3 = GrandExchangeOfferOwnWorldComparator.field640 * 16384 + 64; - var4 = ReflectionCheck.field1319 * 16384 + 64; - var5 = WorldMapSectionType.getTileHeight(var3, var4, Clock.Client_plane) - AbstractWorldMapIcon.field306; - if (HitSplatDefinition.cameraX < var3) { - HitSplatDefinition.cameraX = (var3 - HitSplatDefinition.cameraX) * WorldMapElement.field3230 / 1000 + HitSplatDefinition.cameraX + FontName.field3660; - if (HitSplatDefinition.cameraX > var3) { - HitSplatDefinition.cameraX = var3; + 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 (HitSplatDefinition.cameraX > var3) { - HitSplatDefinition.cameraX -= WorldMapElement.field3230 * (HitSplatDefinition.cameraX - var3) / 1000 + FontName.field3660; - if (HitSplatDefinition.cameraX < var3) { - HitSplatDefinition.cameraX = var3; + if (WorldMapRectangle.cameraX > var4) { + WorldMapRectangle.cameraX -= NetFileRequest.field3126 * (WorldMapRectangle.cameraX - var4) / 1000 + GrandExchangeOfferWorldComparator.field64; + if (WorldMapRectangle.cameraX < var4) { + WorldMapRectangle.cameraX = var4; } } - if (class51.cameraY < var5) { - class51.cameraY = (var5 - class51.cameraY) * WorldMapElement.field3230 / 1000 + class51.cameraY + FontName.field3660; - if (class51.cameraY > var5) { - class51.cameraY = var5; + if (GrandExchangeOfferWorldComparator.cameraY < var6) { + GrandExchangeOfferWorldComparator.cameraY = (var6 - GrandExchangeOfferWorldComparator.cameraY) * NetFileRequest.field3126 / 1000 + GrandExchangeOfferWorldComparator.cameraY + GrandExchangeOfferWorldComparator.field64; + if (GrandExchangeOfferWorldComparator.cameraY > var6) { + GrandExchangeOfferWorldComparator.cameraY = var6; } } - if (class51.cameraY > var5) { - class51.cameraY -= WorldMapElement.field3230 * (class51.cameraY - var5) / 1000 + FontName.field3660; - if (class51.cameraY < var5) { - class51.cameraY = var5; + if (GrandExchangeOfferWorldComparator.cameraY > var6) { + GrandExchangeOfferWorldComparator.cameraY -= NetFileRequest.field3126 * (GrandExchangeOfferWorldComparator.cameraY - var6) / 1000 + GrandExchangeOfferWorldComparator.field64; + if (GrandExchangeOfferWorldComparator.cameraY < var6) { + GrandExchangeOfferWorldComparator.cameraY = var6; } } - if (Actor.cameraZ < var4) { - Actor.cameraZ = (var4 - Actor.cameraZ) * WorldMapElement.field3230 / 1000 + Actor.cameraZ + FontName.field3660; - if (Actor.cameraZ > var4) { - Actor.cameraZ = var4; + if (class200.cameraZ < var5) { + class200.cameraZ = (var5 - class200.cameraZ) * NetFileRequest.field3126 / 1000 + class200.cameraZ + GrandExchangeOfferWorldComparator.field64; + if (class200.cameraZ > var5) { + class200.cameraZ = var5; } } - if (Actor.cameraZ > var4) { - Actor.cameraZ -= WorldMapElement.field3230 * (Actor.cameraZ - var4) / 1000 + FontName.field3660; - if (Actor.cameraZ < var4) { - Actor.cameraZ = var4; + if (class200.cameraZ > var5) { + class200.cameraZ -= NetFileRequest.field3126 * (class200.cameraZ - var5) / 1000 + GrandExchangeOfferWorldComparator.field64; + if (class200.cameraZ < var5) { + class200.cameraZ = var5; } } - var3 = class188.field2346 * 16384 + 64; - var4 = WorldMapLabelSize.field139 * 128 + 64; - var5 = WorldMapSectionType.getTileHeight(var3, var4, Clock.Client_plane) - PlayerAppearance.field2549; - var6 = var3 - HitSplatDefinition.cameraX; - var7 = var5 - class51.cameraY; - var8 = var4 - Actor.cameraZ; - var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; - if (var10 < 128) { - var10 = 128; + 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 (var10 > 383) { - var10 = 383; + if (var11 > 383) { + var11 = 383; } - if (GrandExchangeOffer.cameraPitch < var10) { - GrandExchangeOffer.cameraPitch = (var10 - GrandExchangeOffer.cameraPitch) * class51.field435 / 1000 + GrandExchangeOffer.cameraPitch + WorldMapSprite.field240; - if (GrandExchangeOffer.cameraPitch > var10) { - GrandExchangeOffer.cameraPitch = var10; + if (class74.cameraPitch < var11) { + class74.cameraPitch = (var11 - class74.cameraPitch) * Players.field1280 / 1000 + class74.cameraPitch + Friend.field3626; + if (class74.cameraPitch > var11) { + class74.cameraPitch = var11; } } - if (GrandExchangeOffer.cameraPitch > var10) { - GrandExchangeOffer.cameraPitch -= class51.field435 * (GrandExchangeOffer.cameraPitch - var10) / 1000 + WorldMapSprite.field240; - if (GrandExchangeOffer.cameraPitch < var10) { - GrandExchangeOffer.cameraPitch = var10; + if (class74.cameraPitch > var11) { + class74.cameraPitch -= Players.field1280 * (class74.cameraPitch - var11) / 1000 + Friend.field3626; + if (class74.cameraPitch < var11) { + class74.cameraPitch = var11; } } - var12 = var11 - FriendSystem.cameraYaw; - if (var12 > 1024) { - var12 -= 2048; + int var27 = var12 - WorldMapIcon_1.cameraYaw; + if (var27 > 1024) { + var27 -= 2048; } - if (var12 < -1024) { - var12 += 2048; + if (var27 < -1024) { + var27 += 2048; } - if (var12 > 0) { - FriendSystem.cameraYaw = FriendSystem.cameraYaw + WorldMapSprite.field240 + var12 * class51.field435 / 1000; - FriendSystem.cameraYaw &= 2047; + if (var27 > 0) { + WorldMapIcon_1.cameraYaw = var27 * Players.field1280 / 1000 + WorldMapIcon_1.cameraYaw + Friend.field3626; + WorldMapIcon_1.cameraYaw &= 2047; } - if (var12 < 0) { - FriendSystem.cameraYaw -= -var12 * class51.field435 / 1000 + WorldMapSprite.field240; - FriendSystem.cameraYaw &= 2047; + if (var27 < 0) { + WorldMapIcon_1.cameraYaw -= Friend.field3626 + -var27 * Players.field1280 / 1000; + WorldMapIcon_1.cameraYaw &= 2047; } - int var28 = var11 - FriendSystem.cameraYaw; - if (var28 > 1024) { - var28 -= 2048; + int var14 = var12 - WorldMapIcon_1.cameraYaw; + if (var14 > 1024) { + var14 -= 2048; } - if (var28 < -1024) { - var28 += 2048; + if (var14 < -1024) { + var14 += 2048; } - if (var28 < 0 && var12 > 0 || var28 > 0 && var12 < 0) { - FriendSystem.cameraYaw = var11; + if (var14 < 0 && var27 > 0 || var14 > 0 && var27 < 0) { + WorldMapIcon_1.cameraYaw = var12; } } - for (var3 = 0; var3 < 5; ++var3) { - int var10002 = field895[var3]++; + for (var4 = 0; var4 < 5; ++var4) { + int var10002 = field930[var4]++; } - class197.varcs.tryWrite(); - var3 = SpriteMask.method4038(); - var4 = FontName.method5401(); - if (var3 > 15000 && var4 > 15000) { + UserComparator4.varcs.tryWrite(); + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; + var6 = KeyHandler.KeyHandler_idleCycles; + PacketBufferNode var28; + if (var4 > 15000 && var6 > 15000) { logoutTimer = 250; - MouseHandler.MouseHandler_idleCycles = 14500; - var43 = TilePaint.getPacketBufferNode(ClientPacket.field2287, packetWriter.isaacCipher); - packetWriter.addNode(var43); + ServerPacket.method3684(14500); + var28 = FaceNormal.getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); + packetWriter.addNode(var28); } - KeyHandler.friendSystem.processFriendUpdates(); + Projectile.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var43 = TilePaint.getPacketBufferNode(ClientPacket.field2247, packetWriter.isaacCipher); - packetWriter.addNode(var43); + var28 = FaceNormal.getPacketBufferNode(ClientPacket.field2295, packetWriter.isaacCipher); + packetWriter.addNode(var28); } try { packetWriter.flush(); } catch (IOException var29) { - WorldMapIcon_1.method308(); + VertexNormal.method3093(); } return; } - var41 = var40.widget; - if (var41.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var27 = Varps.getWidget(var41.parentId); - } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); + var40 = MusicPatchNode.getWidget(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - class4.runScriptEvent(var40); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); } } - var41 = var40.widget; - if (var41.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var27 = Varps.getWidget(var41.parentId); - } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); + var40 = MusicPatchNode.getWidget(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - class4.runScriptEvent(var40); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); } } - var41 = var40.widget; - if (var41.childIndex < 0) { + var45 = var43.widget; + if (var45.childIndex < 0) { break; } - var27 = Varps.getWidget(var41.parentId); - } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); + var40 = MusicPatchNode.getWidget(var45.parentId); + } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); - class4.runScriptEvent(var40); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); } } + + 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("gx") + @ObfuscatedName("ga") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "2" + signature = "(I)V", + garbageValue = "-61779781" ) @Export("resizeJS") void resizeJS() { - int var1 = Username.canvasWidth; - int var2 = WorldMapData_1.canvasHeight; + int var1 = WorldMapLabel.canvasWidth; + int var2 = Varps.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -4055,10 +3916,10 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (WorldMapSection2.clientPreferences != null) { + if (GrandExchangeOfferOwnWorldComparator.clientPreferences != null) { try { - Client var3 = Username.client; - Object[] var4 = new Object[]{Friend.getWindowedMode()}; + Client var3 = WorldMapSection1.client; + Object[] var4 = new Object[]{class74.getWindowedMode()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { } @@ -4066,184 +3927,171 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("gp") + @ObfuscatedName("gc") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1323665648" + signature = "(B)V", + garbageValue = "38" ) @Export("drawLoggedIn") final void drawLoggedIn() { + int var1; if (rootInterface != -1) { - GrandExchangeOfferNameComparator.method150(rootInterface); + var1 = rootInterface; + if (LoginScreenAnimation.loadInterface(var1)) { + MilliClock.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); + } } - int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field851[var1]) { - field852[var1] = true; + if (field679[var1]) { + field886[var1] = true; } - field853[var1] = field851[var1]; - field851[var1] = false; + field813[var1] = field679[var1]; + field679[var1] = false; } - field850 = cycle; + field884 = cycle; viewportX = -1; viewportY = -1; - FloorDecoration.field1604 = null; + RouteStrategy.field2106 = null; if (rootInterface != -1) { rootWidgetCount = 0; - ServerPacket.drawWidgets(rootInterface, 0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight, 0, 0, -1); + MusicPatch.drawWidgets(rootInterface, 0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - WorldMapData_0.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class299.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - WorldMapData_0.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class299.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } + int var2; + int var3; if (!isMenuOpen) { if (viewportX != -1) { - Ignored.method5213(viewportX, viewportY); + var1 = viewportX; + var2 = viewportY; + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { + var3 = AbstractWorldMapData.method381(); + String var4; + if (isItemSelected == 1 && menuOptionsCount < 2) { + var4 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { + var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + String var5; + if (var3 < 0) { + var5 = ""; + } else if (menuTargets[var3].length() > 0) { + var5 = menuActions[var3] + " " + menuTargets[var3]; + } else { + var5 = menuActions[var3]; + } + + var4 = var5; + } + + if (menuOptionsCount > 2) { + var4 = var4 + class297.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + TaskHandler.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + } } } else { - class4.method64(); + var1 = WorldMapDecoration.menuX; + var2 = PacketBufferNode.menuY; + var3 = class49.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); + } + + class49.method848(WorldMapDecoration.menuX, PacketBufferNode.menuY, class49.menuWidth, WorldMapData_1.menuHeight); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field853[var1]) { + if (field813[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field852[var1]) { + } else if (field886[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - var1 = Clock.Client_plane; - int var2 = class192.localPlayer.x; - int var3 = class192.localPlayer.y; - int var4 = field707; - - for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { - int var6 = 0; - if (var2 > var5.field1069 * 16384) { - var6 += var2 - var5.field1069 * 16384; - } else if (var2 < var5.x * 16384) { - var6 += var5.x * 16384 - var2; - } - - if (var3 > var5.field1080 * 128) { - var6 += var3 - var5.field1080 * 128; - } else if (var3 < var5.y * 128) { - var6 += var5.y * 128 - var3; - } - - if (var6 - 64 <= var5.field1070 && areaSoundEffectVolume != 0 && var1 == var5.plane) { - var6 -= 64; - if (var6 < 0) { - var6 = 0; - } - - int var7 = (var5.field1070 - var6) * areaSoundEffectVolume / var5.field1070; - Object var10000; - if (var5.stream1 == null) { - if (var5.soundEffectId >= 0) { - var10000 = null; - SoundEffect var8 = SoundEffect.readSoundEffect(archive4, var5.soundEffectId, 0); - if (var8 != null) { - RawSound var9 = var8.toRawSound().resample(WorldMapSection1.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); - var10.setNumLoops(-1); - class2.pcmStreamMixer.addSubStream(var10); - var5.stream1 = var10; - } - } - } else { - var5.stream1.method2665(var7); - } - - if (var5.stream2 == null) { - if (var5.soundEffectIds != null && (var5.field1077 -= var4) <= 0) { - int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); - var10000 = null; - SoundEffect var13 = SoundEffect.readSoundEffect(archive4, var5.soundEffectIds[var12], 0); - if (var13 != null) { - RawSound var14 = var13.toRawSound().resample(WorldMapSection1.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); - var11.setNumLoops(0); - class2.pcmStreamMixer.addSubStream(var11); - var5.stream2 = var11; - var5.field1077 = var5.field1074 + (int)(Math.random() * (double)(var5.field1075 - var5.field1074)); - } - } - } else { - var5.stream2.method2665(var7); - if (!var5.stream2.hasNext()) { - var5.stream2 = null; - } - } - } else { - if (var5.stream1 != null) { - class2.pcmStreamMixer.removeSubStream(var5.stream1); - var5.stream1 = null; - } - - if (var5.stream2 != null) { - class2.pcmStreamMixer.removeSubStream(var5.stream2); - var5.stream2 = null; - } - } - } - } - - field707 = 0; + Message.method1300(ScriptEvent.Client_plane, ByteArrayPool.localPlayer.x, ByteArrayPool.localPlayer.y, field741); + field741 = 0; } - @ObfuscatedName("hs") + @ObfuscatedName("hl") @ObfuscatedSignature( - signature = "(Lci;I)Z", - garbageValue = "1768904673" + signature = "(Ldv;I)Z", + garbageValue = "-124055306" ) - final boolean method1363(PacketWriter var1) { + final boolean method1524(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { int var6; - String var16; + String var27; try { int var5; if (var1.serverPacket == null) { - if (var1.field1301) { + if (var1.field1335) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1299 = 0; - var1.field1301 = false; + var1.field1338 = 0; + var1.field1335 = false; } var3.offset = 0; - if (var3.method5539()) { + if (var3.method5524()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1299 = 0; + var1.field1338 = 0; } - var1.field1301 = true; - ServerPacket[] var4 = Occluder.ServerPacket_values(); + var1.field1335 = true; + ServerPacket[] var4 = KeyHandler.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4278,554 +4126,58 @@ public final class Client extends GameShell implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1299 = 0; - timer.method5044(); - var1.field1307 = var1.field1305; - var1.field1305 = var1.field1309; - var1.field1309 = var1.serverPacket; - if (ServerPacket.field2116 == var1.serverPacket) { - WorldMapLabel.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2118 == var1.serverPacket) { - class30.logOut(); - var1.serverPacket = null; - return false; - } - - String var38; - if (ServerPacket.field2200 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var16 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); - ClientPreferences.addGameMessage(6, var38, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2322); - var1.serverPacket = null; - return true; - } - - int var17; - if (ServerPacket.field2181 == var1.serverPacket) { - for (var17 = 0; var17 < players.length; ++var17) { - if (players[var17] != null) { - players[var17].sequence = -1; - } - } - - for (var17 = 0; var17 < npcs.length; ++var17) { - if (npcs[var17] != null) { - npcs[var17].sequence = -1; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2185 == var1.serverPacket) { - KeyHandler.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - class96.FriendSystem_invalidateIgnoreds(); - field839 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2145 == var1.serverPacket) { - publicChatMode = var3.readUnsignedByte(); - tradeChatMode = var3.method5606(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2180 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var17] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); - } - - field841 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - var17 = var3.readInt(); - if (var17 != field727) { - field727 = var17; - WorldMapCacheName.method636(); + var1.field1338 = 0; + timer.method5051(); + var1.field1339 = var1.field1329; + var1.field1329 = var1.field1334; + var1.field1334 = 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; } + class22.changeGameOptions(var16); + field866[++field772 - 1 & 31] = var16; var1.serverPacket = null; return true; } + int var42; if (ServerPacket.field2129 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - if (var17 == 65535) { - var17 = -1; - } - - BufferedSink.playSong(var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2198 == var1.serverPacket) { - var17 = var3.method5762(); - if (var17 == 65535) { - var17 = -1; - } - - var5 = var3.method5620(); - class49.playSoundJingle(var17, var5); - var1.serverPacket = null; - return true; - } - - int var7; - if (ServerPacket.field2166 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); + var16 = var3.readUnsignedByte(); var5 = var3.readUnsignedByte(); var6 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field775[var17] = true; - field892[var17] = var5; - field699[var17] = var6; - field894[var17] = var7; - field895[var17] = 0; + var42 = var3.readUnsignedByte(); + field926[var16] = true; + field788[var16] = var5; + field730[var16] = var6; + field929[var16] = var42; + field930[var16] = 0; var1.serverPacket = null; return true; } - if (ServerPacket.field2125 == var1.serverPacket) { - var17 = var3.method5614(); - var5 = var3.method5665(); - Varps.Varps_temp[var17] = var5; - if (Varps.Varps_main[var17] != var5) { - Varps.Varps_main[var17] = var5; - } - - ServerPacket.changeGameOptions(var17); - field832[++field833 - 1 & 31] = var17; + if (ServerPacket.field2160 == var1.serverPacket) { + WorldMapData_1.method816(class194.field2325); var1.serverPacket = null; return true; } - int var8; - int var9; - Widget var18; - if (ServerPacket.field2150 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { - var5 += 32768; - } - - if (var17 >= 0) { - var18 = Varps.getWidget(var17); - } else { - var18 = null; - } - - for (; var3.offset < var1.serverPacketLength; PlayerAppearance.itemContainerSetItem(var5, var7, var8 - 1, var9)) { - var7 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { - var18.itemIds[var7] = var8; - var18.itemQuantities[var7] = var9; - } - } - - if (var18 != null) { - NPCDefinition.invalidateWidget(var18); - } - - BufferedSource.method5934(); - changedItemContainers[++field835 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - boolean var41; - if (ServerPacket.field2173 == var1.serverPacket) { - var17 = var3.readInt(); - var41 = var3.readUnsignedByte() == 1; - var18 = Varps.getWidget(var17); - if (var41 != var18.isHidden) { - var18.isHidden = var41; - NPCDefinition.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - Widget var51; - if (ServerPacket.field2161 == var1.serverPacket) { - var17 = var3.method5626(); - var51 = Varps.getWidget(var17); - - for (var6 = 0; var6 < var51.itemIds.length; ++var6) { - var51.itemIds[var6] = -1; - var51.itemIds[var6] = 0; - } - - NPCDefinition.invalidateWidget(var51); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - KeyHandler.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2135 == var1.serverPacket) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.method5296(var3); - } - - Players.method2189(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - var17 = var3.method5625(); - var51 = Varps.getWidget(var17); - var51.modelType = 3; - var51.modelId = class192.localPlayer.appearance.getChatHeadId(); - NPCDefinition.invalidateWidget(var51); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2183 == var1.serverPacket) { - FontName.field3663 = var3.readUnsignedByte(); - SecureRandomCallable.field531 = var3.method5605(); - - for (var17 = SecureRandomCallable.field531; var17 < SecureRandomCallable.field531 + 8; ++var17) { - for (var5 = FontName.field3663; var5 < FontName.field3663 + 8; ++var5) { - if (groundItems[Clock.Client_plane][var17][var5] != null) { - groundItems[Clock.Client_plane][var17][var5] = null; - WorldMapEvent.updateItemPile(var17, var5); - } - } - } - - for (PendingSpawn var42 = (PendingSpawn)pendingSpawns.last(); var42 != null; var42 = (PendingSpawn)pendingSpawns.previous()) { - if (var42.x >= SecureRandomCallable.field531 && var42.x < SecureRandomCallable.field531 + 8 && var42.y >= FontName.field3663 && var42.y < FontName.field3663 + 8 && var42.plane == Clock.Client_plane) { - var42.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2139 == var1.serverPacket) { - InterfaceParent.method1192(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2178 == var1.serverPacket) { - var17 = var3.method5740(); - rootInterface = var17; - this.resizeRoot(false); - class51.Widget_resetModelFrames(var17); - WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field851[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { - VarpDefinition var50 = Messages.VarpDefinition_get(var17); - if (var50 != null) { - Varps.Varps_temp[var17] = 0; - Varps.Varps_main[var17] = 0; - } - } - - BufferedSource.method5934(); - field833 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2123 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2319); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2144 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2327); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2153 == var1.serverPacket) { - byte var61 = var3.method5609(); - var5 = var3.method5740(); - Varps.Varps_temp[var5] = var61; - if (Varps.Varps_main[var5] != var61) { - Varps.Varps_main[var5] = var61; - } - - ServerPacket.changeGameOptions(var5); - field832[++field833 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2192 == var1.serverPacket) { - isCameraLocked = false; - - for (var17 = 0; var17 < 5; ++var17) { - field775[var17] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2146 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - Object[] var49 = new Object[var38.length() + 1]; - - for (var6 = var38.length() - 1; var6 >= 0; --var6) { - if (var38.charAt(var6) == 's') { - var49[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var49[var6 + 1] = new Integer(var3.readInt()); - } - } - - var49[0] = new Integer(var3.readInt()); - ScriptEvent var57 = new ScriptEvent(); - var57.args = var49; - class4.runScriptEvent(var57); - var1.serverPacket = null; - return true; - } - - Widget var54; - if (ServerPacket.field2133 == var1.serverPacket) { - var17 = var3.readUnsignedShort(); - var5 = var3.method5740(); - var6 = var3.method5665(); - var54 = Varps.getWidget(var6); - var54.field2696 = var17 + (var5 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - var17 = var3.method5610(); - var5 = var3.method5722(); - var6 = var3.readInt(); - var54 = Varps.getWidget(var6); - if (var17 != var54.rawX || var5 != var54.rawY || var54.xAlignment != 0 || var54.yAlignment != 0) { - var54.rawX = var17; - var54.rawY = var5; - var54.xAlignment = 0; - var54.yAlignment = 0; - NPCDefinition.invalidateWidget(var54); - this.alignWidget(var54); - if (var54.type == 0) { - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var6 >> 16], var54, false); - } - } - - var1.serverPacket = null; - return true; - } - - long var20; - if (ServerPacket.field2121 == var1.serverPacket) { - var17 = var3.method5625(); - var5 = var3.method5665(); - var6 = var3.method5762(); - if (var6 == 65535) { - var6 = -1; - } - - var7 = var3.method5740(); - if (var7 == 65535) { - var7 = -1; - } - - for (var8 = var6; var8 <= var7; ++var8) { - var20 = ((long)var5 << 32) + (long)var8; - Node var44 = widgetClickMasks.get(var20); - if (var44 != null) { - var44.remove(); - } - - widgetClickMasks.put(new IntegerNode(var17), var20); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - KeyHandler.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - int var10; - if (ServerPacket.field2182 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var17 < -70000) { - var5 += 32768; - } - - if (var17 >= 0) { - var18 = Varps.getWidget(var17); - } else { - var18 = null; - } - - if (var18 != null) { - for (var7 = 0; var7 < var18.itemIds.length; ++var7) { - var18.itemIds[var7] = 0; - var18.itemQuantities[var7] = 0; - } - } - - WorldMapRectangle.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var7; ++var8) { - var9 = var3.method5740(); - var10 = var3.readUnsignedByte(); - if (var10 == 255) { - var10 = var3.readInt(); - } - - if (var18 != null && var8 < var18.itemIds.length) { - var18.itemIds[var8] = var9; - var18.itemQuantities[var8] = var10; - } - - PlayerAppearance.itemContainerSetItem(var5, var8, var9 - 1, var10); - } - - if (var18 != null) { - NPCDefinition.invalidateWidget(var18); - } - - BufferedSource.method5934(); - changedItemContainers[++field835 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2315); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2175 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2316); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { - var17 = var3.method5740(); - var5 = var3.readInt(); - var6 = var17 >> 10 & 31; - var7 = var17 >> 5 & 31; - var8 = var17 & 31; - var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); - Widget var59 = Varps.getWidget(var5); - if (var9 != var59.color) { - var59.color = var9; - NPCDefinition.invalidateWidget(var59); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2170 == var1.serverPacket) { - if (rootInterface != -1) { - class226.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - SecureRandomCallable.field531 = var3.method5771(); - FontName.field3663 = var3.method5605(); - - while (var3.offset < var1.serverPacketLength) { - var17 = var3.readUnsignedByte(); - class185 var48 = class83.method2107()[var17]; - GrandExchangeOfferWorldComparator.method77(var48); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { + if (ServerPacket.field2187 == var1.serverPacket) { isCameraLocked = true; - class188.field2346 = var3.readUnsignedByte() * 128; - WorldMapLabelSize.field139 = var3.readUnsignedByte() * 16384; - PlayerAppearance.field2549 = var3.readUnsignedShort(); - WorldMapSprite.field240 = var3.readUnsignedByte(); - class51.field435 = var3.readUnsignedByte(); - if (class51.field435 >= 100) { - var17 = class188.field2346 * 16384 + 64; - var5 = WorldMapLabelSize.field139 * 128 + 64; - var6 = WorldMapSectionType.getTileHeight(var17, var5, Clock.Client_plane) - PlayerAppearance.field2549; - var7 = var17 - HitSplatDefinition.cameraX; - var8 = var6 - class51.cameraY; - var9 = var5 - Actor.cameraZ; - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - GrandExchangeOffer.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; - FriendSystem.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (GrandExchangeOffer.cameraPitch < 128) { - GrandExchangeOffer.cameraPitch = 128; - } - - if (GrandExchangeOffer.cameraPitch > 383) { - GrandExchangeOffer.cameraPitch = 383; - } + 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; } var1.serverPacket = null; @@ -4833,268 +4185,259 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2199 == var1.serverPacket) { - BufferedSource.method5934(); - var17 = var3.method5626(); - var5 = var3.readUnsignedByte(); - var6 = var3.method5605(); - experience[var5] = var17; - currentLevels[var5] = var6; - levels[var5] = 1; + tradeChatMode = var3.method5604(); + publicChatMode = var3.method5604(); + var1.serverPacket = null; + return true; + } - for (var7 = 0; var7 < 98; ++var7) { - if (var17 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; - } + if (ServerPacket.field2144 == var1.serverPacket) { + Projectile.friendSystem.readUpdate(var3, var1.serverPacketLength); + field873 = cycleCntr; + 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); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2145 == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 64; + hintArrowSubY = 64; + } + + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 128; + hintArrowSubY = 64; + } + + if (hintArrowType == 5) { + hintArrowSubX = 64; + hintArrowSubY = 0; + } + + if (hintArrowType == 6) { + hintArrowSubX = 64; + hintArrowSubY = 128; + } + + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte(); + } + + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); } - changedSkills[++changedSkillsCount - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.field2167 == var1.serverPacket) { - class13.readReflectionCheck(var3, var1.serverPacketLength); + 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.field2132 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - InterfaceParent.clanChat = null; + 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 { - if (InterfaceParent.clanChat == null) { - InterfaceParent.clanChat = new ClanChat(class192.loginType, Username.client); - } - - InterfaceParent.clanChat.readUpdate(var3); - } - - Players.method2189(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - var17 = var3.method5762(); - class215.method4101(var17); - changedItemContainers[++field835 - 1 & 31] = var17 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - var17 = var3.readInt(); - var5 = var3.readInt(); - var6 = GrandExchangeEvent.getGcDuration(); - PacketBufferNode var56 = TilePaint.getPacketBufferNode(ClientPacket.field2214, packetWriter.isaacCipher); - var56.packetBuffer.method5602(GameShell.fps); - var56.packetBuffer.writeByte(var6); - var56.packetBuffer.method5624(var17); - var56.packetBuffer.writeInt(var5); - packetWriter.addNode(var56); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2128 == var1.serverPacket) { - var17 = var3.method5614(); - var5 = var3.method5665(); - var18 = Varps.getWidget(var5); - if (var18 != null && var18.type == 0) { - if (var17 > var18.scrollHeight - var18.height) { - var17 = var18.scrollHeight - var18.height; - } - - if (var17 < 0) { - var17 = 0; - } - - if (var17 != var18.scrollY) { - var18.scrollY = var17; - NPCDefinition.invalidateWidget(var18); - } + WorldMapRectangle.field222 = null; } var1.serverPacket = null; return true; } - if (ServerPacket.field2158 == var1.serverPacket) { - var17 = var3.method5610(); - var5 = var3.readInt(); - var18 = Varps.getWidget(var5); - if (var17 != var18.sequenceId || var17 == -1) { - var18.sequenceId = var17; - var18.modelFrame = 0; - var18.modelFrameCycle = 0; - NPCDefinition.invalidateWidget(var18); + 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) { + 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); + } + + 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) { - var17 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - AbstractWorldMapIcon.queueSoundEffect(var17, var5, var6); + class58.method966(); + weight = var3.readShort(); + field877 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2163 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - GrandExchangeOffer.method127(var17); + if (ServerPacket.field2183 == var1.serverPacket) { + WorldMapData_1.method816(class194.field2323); var1.serverPacket = null; return true; } - InterfaceParent var19; - Widget var23; - if (ServerPacket.field2174 == var1.serverPacket) { - var17 = var3.method5625(); - var5 = var3.method5665(); - InterfaceParent var55 = (InterfaceParent)interfaceParents.get((long)var5); - var19 = (InterfaceParent)interfaceParents.get((long)var17); - if (var19 != null) { - class185.closeInterface(var19, var55 == null || var55.group != var19.group); + int var8; + int var9; + int var10; + if (ServerPacket.field2177 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; } - if (var55 != null) { - var55.remove(); - interfaceParents.put(var55, (long)var17); - } - - var23 = Varps.getWidget(var5); - if (var23 != null) { - NPCDefinition.invalidateWidget(var23); - } - - var23 = Varps.getWidget(var17); - if (var23 != null) { - NPCDefinition.invalidateWidget(var23); - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var23.id >>> 16], var23, true); - } - - if (rootInterface != -1) { - class226.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - boolean var53; - if (ServerPacket.field2149 == var1.serverPacket) { - var53 = var3.readUnsignedByte() == 1; - if (var53) { - class30.field274 = WorldMapIcon_0.currentTimeMillis() - var3.readLong(); - PendingSpawn.grandExchangeEvents = new GrandExchangeEvents(var3, true); + if (var16 >= 0) { + var50 = MusicPatchNode.getWidget(var16); } else { - PendingSpawn.grandExchangeEvents = null; + var50 = null; } - field842 = cycleCntr; + if (var50 != null) { + for (var42 = 0; var42 < var50.itemIds.length; ++var42) { + var50.itemIds[var42] = 0; + var50.itemQuantities[var42] = 0; + } + } + + 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); + } + + if (var50 != null) { + ItemContainer.invalidateWidget(var50); + } + + class58.method966(); + changedItemContainers[++field869 - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.field2187 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2320); + if (ServerPacket.field2147 == var1.serverPacket) { + Projectile.friendSystem.method1953(); + field873 = cycleCntr; var1.serverPacket = null; return true; } - long var24; - long var26; - if (ServerPacket.field2151 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var24 = (long)var3.readUnsignedShort(); - var26 = (long)var3.readMedium(); - PlayerType var28 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var3.readUnsignedByte()); - long var29 = (var24 << 32) + var26; - boolean var12 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (var29 == field865[var13]) { - var12 = true; - break; - } - } - - if (KeyHandler.friendSystem.isIgnored(new Username(var38, class192.loginType))) { - var12 = true; - } - - if (!var12 && field759 == 0) { - field865[field715] = var29; - field715 = (field715 + 1) % 100; - String var31 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); - byte var45; - if (var28.isPrivileged) { - var45 = 7; - } else { - var45 = 3; - } - - if (var28.modIcon != -1) { - ClientPreferences.addGameMessage(var45, Language.method3728(var28.modIcon) + var38, var31); - } else { - ClientPreferences.addGameMessage(var45, var38, var31); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2184 == var1.serverPacket) { - isCameraLocked = true; - GrandExchangeOfferOwnWorldComparator.field640 = var3.readUnsignedByte() * 128; - ReflectionCheck.field1319 = var3.readUnsignedByte() * 128; - AbstractWorldMapIcon.field306 = var3.readUnsignedShort(); - FontName.field3660 = var3.readUnsignedByte(); - WorldMapElement.field3230 = var3.readUnsignedByte(); - if (WorldMapElement.field3230 >= 100) { - HitSplatDefinition.cameraX = GrandExchangeOfferOwnWorldComparator.field640 * 16384 + 64; - Actor.cameraZ = ReflectionCheck.field1319 * 16384 + 64; - class51.cameraY = WorldMapSectionType.getTileHeight(HitSplatDefinition.cameraX, Actor.cameraZ, Clock.Client_plane) - AbstractWorldMapIcon.field306; - } - - var1.serverPacket = null; - return true; - } - - long var32; - if (ServerPacket.field2142 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var24 = var3.readLong(); - var26 = (long)var3.readUnsignedShort(); - var20 = (long)var3.readMedium(); - PlayerType var11 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var3.readUnsignedByte()); - var32 = var20 + (var26 << 32); - boolean var14 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field865[var15] == var32) { - var14 = true; - break; - } - } - - if (var11.isUser && KeyHandler.friendSystem.isIgnored(new Username(var38, class192.loginType))) { - var14 = true; - } - - if (!var14 && field759 == 0) { - field865[field715] = var32; - field715 = (field715 + 1) % 100; - String var34 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); - if (var11.modIcon != -1) { - class173.addChatMessage(9, Language.method3728(var11.modIcon) + var38, var34, WorldMapArea.base37DecodeLong(var24)); - } else { - class173.addChatMessage(9, var38, var34, WorldMapArea.base37DecodeLong(var24)); + 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); } } @@ -5103,116 +4446,99 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2162 == var1.serverPacket) { - var17 = var3.readInt(); - InterfaceParent var47 = (InterfaceParent)interfaceParents.get((long)var17); - if (var47 != null) { - class185.closeInterface(var47, true); - } - - if (meslayerContinueWidget != null) { - NPCDefinition.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2160 == var1.serverPacket) { - WorldMapSectionType.privateChatMode = UserComparator9.method3461(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2189 == var1.serverPacket) { - FontName.field3663 = var3.method5606(); - SecureRandomCallable.field531 = var3.method5771(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2117 == var1.serverPacket) { - World var40 = new World(); - var40.host = var3.readStringCp1252NullTerminated(); - var40.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var40.properties = var5; - Projectile.updateGameState(45); - var2.close(); - var2 = null; - GrandExchangeEvents.changeWorld(var40); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2179 == var1.serverPacket) { - var17 = var3.method5626(); - var5 = var3.method5762(); - var18 = Varps.getWidget(var17); - if (var18.modelType != 1 || var5 != var18.modelId) { - var18.modelType = 1; - var18.modelId = var5; - NPCDefinition.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - var17 = var3.method5625(); - var5 = var3.method5614(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.method5665(); - var54 = Varps.getWidget(var6); - ItemDefinition var60; - if (!var54.isIf3) { - if (var5 == -1) { - var54.modelType = 0; - var1.serverPacket = null; - return true; - } - - var60 = HealthBarDefinition.ItemDefinition_get(var5); - var54.modelType = 4; - var54.modelId = var5; - var54.modelAngleX = var60.xan2d; - var54.modelAngleY = var60.yan2d; - var54.modelZoom = var60.zoom2d * 100 / var17; - NPCDefinition.invalidateWidget(var54); + var60 = var3.readUnsignedByte() == 1; + if (var60) { + TilePaint.field1802 = class217.currentTimeMillis() - var3.readLong(); + GrandExchangeEvent.grandExchangeEvents = new GrandExchangeEvents(var3, true); } else { - var54.itemId = var5; - var54.itemQuantity = var17; - var60 = HealthBarDefinition.ItemDefinition_get(var5); - var54.modelAngleX = var60.xan2d; - var54.modelAngleY = var60.yan2d; - var54.modelAngleZ = var60.zan2d; - var54.modelOffsetX = var60.offsetX2d; - var54.modelOffsetY = var60.offsetY2d; - var54.modelZoom = var60.zoom2d; - if (var60.isStackable == 1) { - var54.itemQuantityMode = 1; + 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 { - var54.itemQuantityMode = 2; + ChatChannel.addChatMessage(9, var37, var25, Buffer.base37DecodeLong(var19)); } - - if (var54.field2627 > 0) { - var54.modelZoom = var54.modelZoom * 32 / var54.field2627; - } else if (var54.rawWidth > 0) { - var54.modelZoom = var54.modelZoom * 32 / var54.rawWidth; - } - - NPCDefinition.invalidateWidget(var54); } var1.serverPacket = null; return true; } - if (ServerPacket.field2186 == var1.serverPacket) { + 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; @@ -5227,307 +4553,343 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2152 == var1.serverPacket) { - var53 = var3.readBoolean(); - if (var53) { - if (class218.field2716 == null) { - class218.field2716 = new class238(); - } + if (ServerPacket.field2153 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var50 = MusicPatchNode.getWidget(var16); } else { - class218.field2716 = null; + 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.field2143 == var1.serverPacket) { - var17 = var3.method5614(); - var5 = var3.method5606(); - var6 = var3.method5625(); - var19 = (InterfaceParent)interfaceParents.get((long)var6); - if (var19 != null) { - class185.closeInterface(var19, var17 != var19.group); + if (ServerPacket.field2171 == var1.serverPacket) { + var16 = var3.method5614(); + if (var16 == 65535) { + var16 = -1; } - class287.method5327(var6, var17, var5); + StudioGame.playSong(var16); var1.serverPacket = null; return true; } - if (ServerPacket.field2119 == var1.serverPacket) { - rebootTimer = var3.method5762() * 30; - field795 = cycleCntr; + 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; } - if (ServerPacket.field2134 == var1.serverPacket) { - BufferedSource.method5934(); - runEnergy = var3.readUnsignedByte(); - field795 = cycleCntr; + 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.field2115 == var1.serverPacket) { - AttackOption.updatePlayers(var3, var1.serverPacketLength); - ObjectSound.method1934(); - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2203 == var1.serverPacket) { + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.method5301(var3); + } - if (ServerPacket.field2188 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2323); - var1.serverPacket = null; - return true; - } - - String var52; - if (ServerPacket.field2140 == var1.serverPacket) { - byte[] var39 = new byte[var1.serverPacketLength]; - var3.method5525(var39, 0, var39.length); - Buffer var46 = new Buffer(var39); - var52 = var46.readStringCp1252NullTerminated(); - class215.openURL(var52, true, false); + WorldMapData_0.method263(); var1.serverPacket = null; return true; } if (ServerPacket.field2155 == var1.serverPacket) { - var17 = var3.readUShortSmart(); - var41 = var3.readUnsignedByte() == 1; - var52 = ""; - boolean var43 = false; - if (var41) { - var52 = var3.readStringCp1252NullTerminated(); - if (KeyHandler.friendSystem.isIgnored(new Username(var52, class192.loginType))) { - var43 = true; + 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; } } - String var58 = var3.readStringCp1252NullTerminated(); - if (!var43) { - ClientPreferences.addGameMessage(var17, var52, var58); + 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); } var1.serverPacket = null; return true; } - if (ServerPacket.field2168 == var1.serverPacket) { - var17 = var3.readUnsignedByte(); - class13.forceDisconnect(var17); + if (ServerPacket.field2172 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + ModelData0.method3362(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + class74.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.field2197 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2317); + 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.field2190 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); + 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)); + class74.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 (class74.cameraPitch < 128) { + class74.cameraPitch = 128; + } + + if (class74.cameraPitch > 383) { + class74.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) { - var17 = var3.method5740(); - var5 = var3.method5740(); - var6 = var3.method5625(); - var7 = var3.method5614(); - var23 = Varps.getWidget(var6); - if (var5 != var23.modelAngleX || var7 != var23.modelAngleY || var17 != var23.modelZoom) { - var23.modelAngleX = var5; - var23.modelAngleY = var7; - var23.modelZoom = var17; - NPCDefinition.invalidateWidget(var23); - } + PlatformInfo.field3959 = var3.method5605(); + GrandExchangeOfferTotalQuantityComparator.field91 = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2193 == var1.serverPacket) { - KeyHandler.friendSystem.method1858(); - field839 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2314); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2124 == var1.serverPacket) { - KeyHandler.friendSystem.readUpdate(var3, var1.serverPacketLength); - field839 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 4096; - hintArrowSubY = 64; - } - - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } - - if (hintArrowType == 4) { - hintArrowSubX = 8192; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 4096; - hintArrowSubY = 0; - } - - if (hintArrowType == 6) { - hintArrowSubX = 4096; - hintArrowSubY = 128; - } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte() * 4; - } - - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2122 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var5 = var3.method5606(); - var6 = var3.method5605(); - if (var6 >= 1 && var6 <= 8) { - if (var38.equalsIgnoreCase("null")) { - var38 = null; - } - - playerMenuActions[var6 - 1] = var38; - playerOptionsPriorities[var6 - 1] = var5 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2136 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - UrlRequester.method3373(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2164 == var1.serverPacket) { - GrandExchangeOfferWorldComparator.method77(class185.field2318); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2191 == var1.serverPacket) { - var17 = var3.method5740(); - var5 = var3.method5665(); - var18 = Varps.getWidget(var5); - if (var18.modelType != 2 || var17 != var18.modelId) { - var18.modelType = 2; - var18.modelId = var17; - NPCDefinition.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2177 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var5 = var3.method5665(); - var18 = Varps.getWidget(var5); - if (!var38.equals(var18.text)) { - var18.text = var38; - NPCDefinition.invalidateWidget(var18); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - var17 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class51.Widget_resetModelFrames(rootInterface); - WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field851[var7] = true; - } - } - - InterfaceParent var22; - for (; var6-- > 0; var22.field568 = true) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var22 = (InterfaceParent)interfaceParents.get((long)var7); - if (var22 != null && var8 != var22.group) { - class185.closeInterface(var22, true); - var22 = null; - } - - if (var22 == null) { - var22 = class287.method5327(var7, var8, var9); - } - } - - for (var19 = (InterfaceParent)interfaceParents.first(); var19 != null; var19 = (InterfaceParent)interfaceParents.next()) { - if (var19.field568) { - var19.field568 = false; - } else { - class185.closeInterface(var19, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var17) { - var7 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); - - for (int var35 = var8; var35 <= var9; ++var35) { - var32 = ((long)var7 << 32) + (long)var35; - widgetClickMasks.put(new IntegerNode(var10), var32); - } + while (var3.offset < var1.serverPacketLength) { + var16 = var3.readUnsignedByte(); + class194 var58 = WorldMapSection2.method434()[var16]; + WorldMapData_1.method816(var58); } var1.serverPacket = null; @@ -5535,17 +4897,55 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2131 == var1.serverPacket) { - WorldMapLabel.loadRegions(true, var1.packetBuffer); + 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.field2196 == var1.serverPacket) { - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { - if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; - ServerPacket.changeGameOptions(var17); - field832[++field833 - 1 & 31] = var17; + 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); } } @@ -5553,144 +4953,592 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2120 == var1.serverPacket) { - BufferedSource.method5934(); - weight = var3.readShort(); - field795 = cycleCntr; + 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; } - class225.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1305 != null ? var1.field1305.id : -1) + "," + (var1.field1307 != null ? var1.field1307.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - class30.logOut(); - } catch (IOException var36) { - WorldMapIcon_1.method308(); - } catch (Exception var37) { - var16 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1305 != null ? var1.field1305.id : -1) + "," + (var1.field1307 != null ? var1.field1307.id : -1) + "," + var1.serverPacketLength + "," + (class192.localPlayer.pathX[0] + Messages.baseX * 64) + "," + (class192.localPlayer.pathY[0] + Language.baseY * 64) + ","; - - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var16 = var16 + var3.array[var6] + ","; + if (ServerPacket.field2180 == var1.serverPacket) { + GrandExchangeOffer.updateNpcs(false, var3); + var1.serverPacket = null; + return true; } - class225.RunException_sendStackTrace(var16, var37); - class30.logOut(); + 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); + } + } + + var1.serverPacket = null; + return true; + } + + 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; + } + + 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); + } + + 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); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2167 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + Object[] var52 = new Object[var37.length() + 1]; + + 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); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2151 == var1.serverPacket) { + for (var16 = 0; var16 < players.length; ++var16) { + if (players[var16] != null) { + players[var16].sequence = -1; + } + } + + for (var16 = 0; var16 < npcs.length; ++var16) { + if (npcs[var16] != null) { + npcs[var16].sequence = -1; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.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); + } + + 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 (rootInterface != -1) { + class198.runIntfCloseListeners(rootInterface, 1); + } + + 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) + ","; + + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { + var27 = var27 + var3.array[var6] + ","; + } + + WorldMapDecorationType.RunException_sendStackTrace(var27, var36); + Huffman.logOut(); } return true; } } - @ObfuscatedName("hh") + @ObfuscatedName("ho") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1020734975" + signature = "(B)V", + garbageValue = "93" ) @Export("menu") final void menu() { - class60.method1186(); - if (class185.dragInventoryWidget == null) { + class69.method1275(); + if (class236.dragInventoryWidget == null) { if (clickedWidget == null) { int var2; + int var4; int var5; - int var6; - label320: { + int var9; + int var10; + label303: { int var1 = MouseHandler.MouseHandler_lastButton; - int var4; - int var7; - int var9; + int var3; + int var6; + int var8; if (isMenuOpen) { - int var3; - int var18; - if (var1 != 1 && (ArchiveLoader.mouseCam || var1 != 4)) { + int var19; + if (var1 != 1 && (class217.mouseCam || var1 != 4)) { var2 = MouseHandler.MouseHandler_x; var3 = MouseHandler.MouseHandler_y; - if (var2 < ArchiveDiskAction.menuX - 10 || var2 > ArchiveDiskAction.menuX + InterfaceParent.menuWidth + 10 || var3 < SecureRandomCallable.menuY - 10 || var3 > Message.menuHeight + SecureRandomCallable.menuY + 10) { + if (var2 < WorldMapDecoration.menuX - 10 || var2 > class49.menuWidth + WorldMapDecoration.menuX + 10 || var3 < PacketBufferNode.menuY - 10 || var3 > WorldMapData_1.menuHeight + PacketBufferNode.menuY + 10) { isMenuOpen = false; - var4 = ArchiveDiskAction.menuX; - var5 = SecureRandomCallable.menuY; - var6 = InterfaceParent.menuWidth; - var7 = Message.menuHeight; + var4 = WorldMapDecoration.menuX; + var5 = PacketBufferNode.menuY; + var6 = class49.menuWidth; + var19 = WorldMapData_1.menuHeight; - for (var18 = 0; var18 < rootWidgetCount; ++var18) { - if (rootWidgetXs[var18] + rootWidgetWidths[var18] > var4 && rootWidgetXs[var18] < var6 + var4 && rootWidgetHeights[var18] + rootWidgetYs[var18] > var5 && rootWidgetYs[var18] < var5 + var7) { - field851[var18] = true; + 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 || !ArchiveLoader.mouseCam && var1 == 4) { - var2 = ArchiveDiskAction.menuX; - var3 = SecureRandomCallable.menuY; - var4 = InterfaceParent.menuWidth; + if (var1 == 1 || !class217.mouseCam && var1 == 4) { + var2 = WorldMapDecoration.menuX; + var3 = PacketBufferNode.menuY; + var4 = class49.menuWidth; var5 = MouseHandler.MouseHandler_lastPressedX; var6 = MouseHandler.MouseHandler_lastPressedY; - var7 = -1; + var19 = -1; - for (var18 = 0; var18 < menuOptionsCount; ++var18) { - var9 = var3 + (menuOptionsCount - 1 - var18) * 15 + 31; + 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) { - var7 = var18; + var19 = var8; } } - int var10; int var11; - if (var7 != -1 && var7 >= 0) { - var18 = menuArguments1[var7]; - var9 = menuArguments2[var7]; - var10 = menuOpcodes[var7]; - var11 = menuIdentifiers[var7]; - String var15 = menuActions[var7]; - String var13 = menuTargets[var7]; - UserComparator10.menuAction(var18, var9, var10, var11, var15, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + 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); } isMenuOpen = false; - var18 = ArchiveDiskAction.menuX; - var9 = SecureRandomCallable.menuY; - var10 = InterfaceParent.menuWidth; - var11 = Message.menuHeight; + var8 = WorldMapDecoration.menuX; + var9 = PacketBufferNode.menuY; + var10 = class49.menuWidth; + var11 = WorldMapData_1.menuHeight; for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var18 && rootWidgetXs[var12] < var10 + var18 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { - field851[var12] = true; + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { + field679[var12] = true; } } } } else { - var2 = menuOptionsCount - 1; - if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && var2 >= 0) { - var4 = menuOpcodes[var2]; - if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { - var5 = menuArguments1[var2]; - var6 = menuArguments2[var2]; - Widget var14 = Varps.getWidget(var6); - var9 = WorldMapIcon_0.getWidgetClickMask(var14); - boolean var8 = (var9 >> 28 & 1) != 0; - if (var8) { - break label320; + 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 (FriendLoginUpdate.method5326(WorldMapIcon_0.getWidgetClickMask(var14))) { - break label320; + if (MilliClock.method3560(ScriptEvent.getWidgetClickMask(var14))) { + break label303; } } } - if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + if ((var1 == 1 || !class217.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { var1 = 2; } - if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var4 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - var6 = menuOpcodes[var2]; - var7 = menuIdentifiers[var2]; + 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]; - UserComparator10.menuAction(var4, var5, var6, var7, var16, var17, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + AbstractByteArrayCopier.menuAction(var3, var4, var5, var6, var16, var17, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } if (var1 == 2 && menuOptionsCount > 0) { @@ -5701,161 +5549,137 @@ public final class Client extends GameShell implements Usernamed { return; } - if (class185.dragInventoryWidget != null && !field757 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - GrandExchangeOfferTotalQuantityComparator.method105(draggedWidgetX, draggedWidgetY); + 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; } - field757 = false; + field887 = false; itemDragDuration = 0; - if (class185.dragInventoryWidget != null) { - NPCDefinition.invalidateWidget(class185.dragInventoryWidget); + if (class236.dragInventoryWidget != null) { + ItemContainer.invalidateWidget(class236.dragInventoryWidget); } - class185.dragInventoryWidget = Varps.getWidget(var6); - dragItemSlotSource = var5; + class236.dragInventoryWidget = MusicPatchNode.getWidget(var5); + dragItemSlotSource = var4; draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; if (var2 >= 0) { - WorldMapRegion.tempMenuAction = new MenuAction(); - WorldMapRegion.tempMenuAction.param0 = menuArguments1[var2]; - WorldMapRegion.tempMenuAction.param1 = menuArguments2[var2]; - WorldMapRegion.tempMenuAction.opcode = menuOpcodes[var2]; - WorldMapRegion.tempMenuAction.identifier = menuIdentifiers[var2]; - WorldMapRegion.tempMenuAction.action = menuActions[var2]; + 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]; } - NPCDefinition.invalidateWidget(class185.dragInventoryWidget); + ItemContainer.invalidateWidget(class236.dragInventoryWidget); } } } - @ObfuscatedName("hu") + @ObfuscatedName("hr") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2097265219" + garbageValue = "1329547181" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = menuOptionsCount - 1; - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequest.method3383(var1)) && !menuShiftClick[var1]; + int var1 = AbstractWorldMapData.method381(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class9.method121(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("hq") + @ObfuscatedName("hv") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-53" + signature = "(III)V", + garbageValue = "1654431956" ) @Export("openMenu") final void openMenu(int var1, int var2) { - int var3 = class1.fontBold12.stringWidth("Choose Option"); - - int var4; - int var5; - for (var4 = 0; var4 < menuOptionsCount; ++var4) { - var5 = class1.fontBold12.stringWidth(VerticalAlignment.method4426(var4)); - if (var5 > var3) { - var3 = var5; - } - } - - var3 += 8; - var4 = menuOptionsCount * 15 + 22; - var5 = var1 - var3 / 2; - if (var5 + var3 > Username.canvasWidth) { - var5 = Username.canvasWidth - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - int var6 = var2; - if (var4 + var2 > WorldMapData_1.canvasHeight) { - var6 = WorldMapData_1.canvasHeight - var4; - } - - if (var6 < 0) { - var6 = 0; - } - - ArchiveDiskAction.menuX = var5; - SecureRandomCallable.menuY = var6; - InterfaceParent.menuWidth = var3; - Message.menuHeight = menuOptionsCount * 15 + 22; - ServerBuild.scene.menuOpen(Clock.Client_plane, var1, var2, false); + MusicPatchNode.method3922(var1, var2); + GrandExchangeOfferWorldComparator.scene.menuOpen(ScriptEvent.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("it") + @ObfuscatedName("ib") @ObfuscatedSignature( - signature = "(ZS)V", - garbageValue = "32113" + signature = "(ZB)V", + garbageValue = "0" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - GrandExchangeOfferUnitPriceComparator.method135(rootInterface, Username.canvasWidth, WorldMapData_1.canvasHeight, 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); + } + } - @ObfuscatedName("iw") + @ObfuscatedName("id") @ObfuscatedSignature( - signature = "(Lhn;I)V", - garbageValue = "-1172183202" + signature = "(Lhe;I)V", + garbageValue = "-159825150" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : Varps.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : MusicPatchNode.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = Username.canvasWidth; - var4 = WorldMapData_1.canvasHeight; + var3 = WorldMapLabel.canvasWidth; + var4 = Varps.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - UrlRequester.alignWidgetSize(var1, var3, var4, false); - InterfaceParent.alignWidgetPosition(var1, var3, var4); + WorldMapAreaData.alignWidgetSize(var1, var3, var4, false); + WorldMapLabelSize.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("jk") + @ObfuscatedName("jz") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "75" + signature = "(S)V", + garbageValue = "22074" ) - final void method1541() { - NPCDefinition.invalidateWidget(clickedWidget); - ++SequenceDefinition.widgetDragDuration; - if (field827 && field824) { + final void method1420() { + ItemContainer.invalidateWidget(clickedWidget); + ++MilliClock.widgetDragDuration; + if (field861 && field732) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field919) { - var1 = field919; + if (var1 < field859) { + var1 = field859; } - if (var1 + clickedWidget.width > field919 + clickedWidgetParent.width) { - var1 = field919 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field859 + clickedWidgetParent.width) { + var1 = field859 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field826) { - var2 = field826; + if (var2 < field881) { + var2 = field881; } - if (var2 + clickedWidget.height > field826 + clickedWidgetParent.height) { - var2 = field826 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field881 + clickedWidgetParent.height) { + var2 = field881 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field864; - int var4 = var2 - field829; + int var3 = var1 - field834; + int var4 = var2 - field863; int var5 = clickedWidget.dragZoneSize; - if (SequenceDefinition.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (MilliClock.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field919 + clickedWidgetParent.scrollX; - int var7 = var2 - field826 + clickedWidgetParent.scrollY; + int var6 = var1 - field859 + clickedWidgetParent.scrollX; + int var7 = var2 - field881 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5863,7 +5687,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - class4.runScriptEvent(var8); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5875,178 +5699,58 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - class4.runScriptEvent(var8); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); } - if (draggedOnWidget != null && ItemContainer.method1184(clickedWidget) != null) { - PacketBufferNode var9 = TilePaint.getPacketBufferNode(ClientPacket.field2242, packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(draggedOnWidget.childIndex); - var9.packetBuffer.method5787(clickedWidget.itemId); - var9.packetBuffer.method5622(clickedWidget.id); - var9.packetBuffer.method5622(draggedOnWidget.id); - var9.packetBuffer.writeShortLE(draggedOnWidget.itemId); - var9.packetBuffer.writeShortLE(clickedWidget.childIndex); - packetWriter.addNode(var9); + 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); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field864 + widgetClickX, widgetClickY + field829); + this.openMenu(field834 + widgetClickX, widgetClickY + field863); } else if (menuOptionsCount > 0) { - GrandExchangeOfferTotalQuantityComparator.method105(widgetClickX + field864, field829 + widgetClickY); + 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; } clickedWidget = null; } } else { - if (SequenceDefinition.widgetDragDuration > 1) { + if (MilliClock.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("ky") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "(I)Ljz;", - garbageValue = "2135870107" + signature = "(I)Lku;", + garbageValue = "-1860083598" ) @Export("username") public Username username() { - return class192.localPlayer != null ? class192.localPlayer.username : null; + return ByteArrayPool.localPlayer != null ? ByteArrayPool.localPlayer.username : null; } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgl;I)I", - garbageValue = "505977953" + signature = "(B)V", + garbageValue = "11" ) - @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 = FloorUnderlayDefinition.standardizeChar(var9, var2); - var10 = FloorUnderlayDefinition.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return class42.lowercaseChar(var9, var2) - class42.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var18 = var0.charAt(var5); - var20 = var1.charAt(var6); - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var18 != var20) { - return class42.lowercaseChar(var18, var2) - class42.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return class42.lowercaseChar(var20, var2) - class42.lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(B)Lfu;", - garbageValue = "4" - ) - public static Clock method1432() { - try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); - } + public static void method1496() { + class206.midiPcmStream.clear(); + class206.field2406 = 1; + class206.musicTrackArchive = null; } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 3d04a6a822..286b3e6254 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,629 +4,629 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gn") @Implements("ClientPacket") -public class ClientPacket implements class181 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2232; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2204; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2205; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2206; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2208; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2209; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2210; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2211; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2296; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2214; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2298; +public class ClientPacket implements class190 { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2297; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgi;" - ) - static final ClientPacket field2295; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2276; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2203; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2223; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2224; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2226; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2227; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2228; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2283; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2288; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2215; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2233; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2262; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2235; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2238; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) public static final ClientPacket field2239; - @ObfuscatedName("ac") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2207; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgi;" - ) - static final ClientPacket field2245; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2249; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2221; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2253; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2255; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2266; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) public static final ClientPacket field2260; - @ObfuscatedName("bp") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2261; - @ObfuscatedName("bl") + public static final ClientPacket field2209; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2259; - @ObfuscatedName("by") + public static final ClientPacket field2210; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2263; - @ObfuscatedName("be") + public static final ClientPacket field2211; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2264; - @ObfuscatedName("bw") + public static final ClientPacket field2244; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2265; - @ObfuscatedName("bt") + public static final ClientPacket field2213; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2220; - @ObfuscatedName("bn") + public static final ClientPacket field2214; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2267; - @ObfuscatedName("bm") + public static final ClientPacket field2215; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2268; - @ObfuscatedName("ba") + public static final ClientPacket field2216; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2269; - @ObfuscatedName("bd") + public static final ClientPacket field2304; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2270; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2271; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2275; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) public static final ClientPacket field2218; - @ObfuscatedName("bu") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2277; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2282; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2284; - @ObfuscatedName("ck") - @ObfuscatedSignature( - signature = "Lgi;" - ) - static final ClientPacket field2285; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("cd") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2287; - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) public static final ClientPacket field2219; - @ObfuscatedName("cz") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2292; - @ObfuscatedName("cu") + public static final ClientPacket field2208; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2293; - @ObfuscatedName("cy") + public static final ClientPacket field2240; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2294; - @ObfuscatedName("ce") + public static final ClientPacket field2222; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2301; - @ObfuscatedName("cw") + public static final ClientPacket field2259; + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2212; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "Lgi;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) public static final ClientPacket field2299; - @ObfuscatedName("cc") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2300; - @ObfuscatedName("ch") + public static final ClientPacket field2224; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2246; - @ObfuscatedName("cx") + public static final ClientPacket field2226; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgn;" ) - public static final ClientPacket field2302; - @ObfuscatedName("cl") + public static final ClientPacket field2227; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgi;" + 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") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2243; + @ObfuscatedName("au") + @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") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2250; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2251; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2252; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2270; + @ObfuscatedName("ac") + @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; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2263; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2266; + @ObfuscatedName("bt") + @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") + @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") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2301; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2302; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2223; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2292; + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2305; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2306; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgn;" + ) + static final ClientPacket field2307; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1068668193 + intValue = 1793698213 ) @Export("id") final int id; - @ObfuscatedName("cj") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -249887029 + intValue = 660997365 ) @Export("length") final int length; static { - field2232 = new ClientPacket(0, 16); - field2204 = new ClientPacket(1, 8); - field2205 = new ClientPacket(2, 8); - field2206 = new ClientPacket(3, 11); - field2229 = new ClientPacket(4, -1); - field2208 = new ClientPacket(5, 4); - field2209 = new ClientPacket(6, 8); - field2210 = new ClientPacket(7, 1); - field2211 = new ClientPacket(8, 3); - field2296 = new ClientPacket(9, 3); - field2213 = new ClientPacket(10, -1); - field2214 = new ClientPacket(11, 10); - field2234 = new ClientPacket(12, 8); - field2298 = new ClientPacket(13, 0); - field2273 = new ClientPacket(14, 8); - field2297 = new ClientPacket(15, 7); - field2295 = new ClientPacket(16, -1); - field2276 = new ClientPacket(17, -1); - field2203 = new ClientPacket(18, -1); - field2222 = new ClientPacket(19, -1); - field2223 = new ClientPacket(20, 13); - field2224 = new ClientPacket(21, 7); - field2225 = new ClientPacket(22, 4); - field2226 = new ClientPacket(23, 8); - field2227 = new ClientPacket(24, 7); - field2228 = new ClientPacket(25, 2); - field2283 = new ClientPacket(26, 3); - field2230 = new ClientPacket(27, 3); - field2288 = new ClientPacket(28, -1); - field2215 = new ClientPacket(29, 8); - field2233 = new ClientPacket(30, -2); - field2262 = new ClientPacket(31, 13); - field2235 = new ClientPacket(32, -1); - field2236 = new ClientPacket(33, 7); - field2237 = new ClientPacket(34, 8); - field2238 = new ClientPacket(35, 3); - field2239 = new ClientPacket(36, 3); - field2240 = new ClientPacket(37, -1); - field2217 = new ClientPacket(38, 9); - field2242 = new ClientPacket(39, 16); - field2243 = new ClientPacket(40, 3); - field2244 = new ClientPacket(41, 7); - field2207 = new ClientPacket(42, -1); - field2245 = new ClientPacket(43, 7); - field2247 = new ClientPacket(44, 0); - field2241 = new ClientPacket(45, -2); - field2249 = new ClientPacket(46, 4); - field2250 = new ClientPacket(47, 14); - field2221 = new ClientPacket(48, 3); - field2216 = new ClientPacket(49, 3); - field2253 = new ClientPacket(50, 8); - field2254 = new ClientPacket(51, 8); - field2255 = new ClientPacket(52, 9); - field2266 = new ClientPacket(53, 3); - field2257 = new ClientPacket(54, 8); - field2258 = new ClientPacket(55, 2); - field2231 = new ClientPacket(56, 7); - field2260 = new ClientPacket(57, -1); - field2261 = new ClientPacket(58, 8); - field2259 = new ClientPacket(59, 8); - field2263 = new ClientPacket(60, -1); - field2264 = new ClientPacket(61, 16); - field2265 = new ClientPacket(62, -1); - field2220 = new ClientPacket(63, 9); - field2267 = new ClientPacket(64, 15); - field2268 = new ClientPacket(65, 8); - field2269 = new ClientPacket(66, 8); - field2270 = new ClientPacket(67, -1); - field2271 = new ClientPacket(68, -1); - field2272 = new ClientPacket(69, 15); - field2290 = new ClientPacket(70, 11); - field2274 = new ClientPacket(71, 0); - field2275 = new ClientPacket(72, 6); - field2218 = new ClientPacket(73, 0); - field2277 = new ClientPacket(74, 2); - field2278 = new ClientPacket(75, 4); - field2251 = new ClientPacket(76, 4); - field2280 = new ClientPacket(77, -1); - field2281 = new ClientPacket(78, 3); - field2282 = new ClientPacket(79, 3); - field2291 = new ClientPacket(80, 8); - field2284 = new ClientPacket(81, 13); - field2285 = new ClientPacket(82, 2); - field2286 = new ClientPacket(83, -2); - field2287 = new ClientPacket(84, 0); - field2279 = new ClientPacket(85, 3); - field2289 = new ClientPacket(86, 5); - field2248 = new ClientPacket(87, 8); - field2219 = new ClientPacket(88, 9); - field2292 = new ClientPacket(89, 7); - field2293 = new ClientPacket(90, -1); - field2294 = new ClientPacket(91, 7); - field2301 = new ClientPacket(92, 7); - field2212 = new ClientPacket(93, 8); - field2256 = new ClientPacket(94, 6); - field2252 = new ClientPacket(95, -1); - field2299 = new ClientPacket(96, 7); - field2300 = new ClientPacket(97, 3); - field2246 = new ClientPacket(98, 2); - field2302 = new ClientPacket(99, 8); - field2303 = new ClientPacket(100, 8); + 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); } ClientPacket(int var1, int var2) { @@ -634,80 +634,296 @@ public class ClientPacket implements class181 { this.length = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;Lii;ZII)V", - garbageValue = "-1455542031" + signature = "(Liy;IIB)[Lla;", + garbageValue = "119" ) - static void method3683(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.field1163) { - if (var3 == 4) { - Login.loginIndex = 4; - } + 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.readySequence; + if (var0.pathLength == 0) { + var0.field1031 = 0; } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = class14.convertJpgToSprite(var4); - class32.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { - FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + 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 { - FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } + var0.x = var3; + var0.y = var4; + --var0.pathLength; + if (var0.field1032 > 0) { + --var0.field1032; + } - ScriptFrame.titleboxSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - class16.runesSprite = FaceNormal.method3336(var1, "runes", ""); - Login.title_muteSprite = FaceNormal.method3336(var1, "title_mute", ""); - WorldMapSprite.options_buttons_0Sprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - ItemContainer.field547 = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - DirectByteArrayCopier.options_buttons_2Sprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - VertexNormal.field1753 = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class216.field2559 = WorldMapSprite.options_buttons_0Sprite.subWidth; - AbstractWorldMapData.field190 = WorldMapSprite.options_buttons_0Sprite.subHeight; - WorldMapLabelSize.loginScreenRunesAnimation = new LoginScreenAnimation(class16.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; } - - Frames.field1885 = 0; - LoginScreenAnimation.otp = ""; - Login.field1185 = true; - Login.worldSelectOpen = false; - if (!WorldMapSection2.clientPreferences.titleMusicDisabled) { - WorldMapData_0.method189(2, MouseHandler.archive6, "scape main", "", 255, false); - } else { - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; - class197.musicTrackGroupId = -1; - class83.musicTrackFileId = -1; - AttackOption.musicTrackVolume = 0; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 2; - } - - TextureProvider.method2833(false); - Login.field1163 = true; - Login.xPadding = (Username.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class96.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); } } - @ObfuscatedName("o") + @ObfuscatedName("iv") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Z", - garbageValue = "799979614" + signature = "(IIIILjava/lang/String;B)V", + garbageValue = "10" ) - static boolean method3682(String var0, int var1) { - return class14.method174(var0, var1, "openjs"); + @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 90a07b39d0..8c4863677d 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,39 +7,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("cq") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1562806739 + intValue = -1654668565 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "Lkr;" + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1650607601 ) - static AbstractSocket field1052; - @ObfuscatedName("o") + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("k") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -122570971 + intValue = -1989279891 ) @Export("windowMode") int windowMode; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("parameters") LinkedHashMap parameters; @@ -52,11 +53,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1849(true); + this.method1942(true); } @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -96,26 +97,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1849(true); + this.method1942(true); } } else { - this.method1849(true); + this.method1942(true); } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "1265192708" + garbageValue = "-1802002327" ) - void method1849(boolean var1) { + void method1942(boolean var1) { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Lkp;", - garbageValue = "-1961223036" + signature = "(I)Lkb;", + garbageValue = "745371681" ) @Export("toBuffer") Buffer toBuffer() { @@ -138,167 +139,12 @@ public class ClientPreferences { return var1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)[Llf;", - garbageValue = "-1068264717" + signature = "(Ljava/lang/String;B)V", + garbageValue = "102" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field3858, FillMode.SOLID, FillMode.field3854}; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-756119302" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class173.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1958479056" - ) - public static void method1854() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var0 == null) { - return; - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "([BIIIIIII[Lfv;I)V", - garbageValue = "-1733201175" - ) - static final void method1853(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 var13 = 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) { - WorldMapArea.loadTerrain(var13, var1, var2 + ModelData0.method3322(var11 & 7, var12 & 7, var7), var3 + ViewportMouse.method3059(var11 & 7, var12 & 7, var7), 0, 0, var7); - } else { - WorldMapArea.loadTerrain(var13, 0, -1, -1, 0, 0, 0); - } - } - } - } - - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "(Lba;I)Z", - garbageValue = "-1602315616" - ) - static boolean method1840(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; - } else { - boolean var1; - if (class192.localPlayer == var0) { - var1 = (Client.drawPlayerNames & 8) != 0; - return var1; - } else { - var1 = MouseRecorder.method1210() || LoginScreenAnimation.method1819() && var0.isFriend(); - if (!var1) { - boolean var2 = (Client.drawPlayerNames & 2) != 0; - var1 = var2 && var0.isClanMember(); - } - - return var1; - } - } - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "14321" - ) - static final void method1852() { - 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.field828[++Client.field766 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var2 = 0; var2 < var1; ++var2) { - int var3 = Client.npcIndices[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var0.readBits(1); - if (var5 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - } else { - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field867[++Client.field690 - 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.method2083(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field867[++Client.field690 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2083(var7, (byte)2); - var8 = var0.readBits(3); - var4.method2083(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field867[++Client.field690 - 1] = var3; - } - } else if (var6 == 3) { - Client.field828[++Client.field766 - 1] = var3; - } - } - } - } - - } + static final void method1950(String var0) { + GrandExchangeEvent.method165("Please remove " + var0 + " from your ignore list first"); } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 270dbdead8..64887eccdd 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -4,95 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fb") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("da") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("ju") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 346699043 + intValue = 2046484107 ) - @Export("Client_plane") - static int Client_plane; + static int field2061; Clock() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "-1351231250" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-561232674" + garbageValue = "-1723558008" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "([BB)Lce;", - garbageValue = "-106" + signature = "(IB)I", + garbageValue = "16" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); + public static 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; + } - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? DynamicObject.method2293(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(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; + @ObfuscatedName("ko") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "2" + ) + static final void method3599() { + Client.field873 = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 930f9c6d5c..bf174777d8 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,40 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fm") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 54587863 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 1510475887 + intValue = -1688029989 ) @Export("xInset") - int xInset; - @ObfuscatedName("aq") + public int xInset; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1655019513 + intValue = -1941455175 ) @Export("yInset") - int yInset; + public int yInset; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -120946659 + intValue = 1262495837 ) @Export("xSize") int xSize; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 910331901 + intValue = -281985159 ) @Export("ySize") int ySize; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("flags") public int[][] flags; @@ -50,10 +44,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "76" + signature = "(I)V", + garbageValue = "-1624935812" ) @Export("clear") public void clear() { @@ -69,12 +63,12 @@ public class CollisionMap { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "1606080292" + garbageValue = "-1240663333" ) - public void method3626(int var1, int var2, int var3, int var4, boolean var5) { + public void method3630(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -221,10 +215,10 @@ public class CollisionMap { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IIIIZB)V", - garbageValue = "1" + garbageValue = "2" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -248,10 +242,10 @@ public class CollisionMap { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-909320528" + garbageValue = "1257789406" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -261,10 +255,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "16" + signature = "(III)V", + garbageValue = "-88147521" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -274,10 +268,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "13415555" + garbageValue = "2136101912" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -285,12 +279,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "-127214723" + garbageValue = "1473004141" ) - public void method3621(int var1, int var2, int var3, int var4, boolean var5) { + public void method3635(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -437,10 +431,10 @@ public class CollisionMap { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(IIIIIZI)V", - garbageValue = "1921144321" + garbageValue = "1811467744" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -470,10 +464,10 @@ public class CollisionMap { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIB)V", - garbageValue = "16" + garbageValue = "61" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -481,70 +475,15 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1328839290" + signature = "(IIB)V", + garbageValue = "-25" ) - public void method3624(int var1, int var2) { + public void method3655(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1311825595" - ) - @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("fn") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-557927999" - ) - static void method3650(int var0, int var1) { - int[] var2 = new int[9]; - - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = var4 * 3 + 600; - int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; - int var6 = Canvas.method864(var5, var1); - var2[var3] = var7 * var6 >> 16; - } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); - } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 3c69776492..9716bc22c2 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -7,24 +7,31 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hj") @Implements("Coord") public class Coord { - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 995034769 + intValue = 301187265 ) - @Export("plane") - public int plane; - @ObfuscatedName("t") + public static int field2530; + @ObfuscatedName("cd") + public static char field2531; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1797414909 - ) - @Export("x") - public int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1015808091 + intValue = 762647407 ) @Export("y") public int y; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 660497933 + ) + @Export("plane") + public int plane; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1808182037 + ) + @Export("x") + public int x; @ObfuscatedSignature( signature = "(Lhj;)V" @@ -52,20 +59,20 @@ public class Coord { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "6116423" + garbageValue = "-1927907066" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lhj;I)Z", - garbageValue = "-557558477" + garbageValue = "-2112462573" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -78,24 +85,16 @@ public class Coord { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-120" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "404618696" ) @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,4 +102,237 @@ public class Coord { return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } } + + public String toString() { + return this.toString(","); + } + + public int hashCode() { + return this.packed(); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)[Lie;", + garbageValue = "112" + ) + 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); + } + } else { + var19.remove(); + } + } + + 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(); + 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; + class74.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 = class74.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 (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) { + class74.cameraPitch += var11; + if (class74.cameraPitch < 128) { + class74.cameraPitch = 128; + } + + if (class74.cameraPitch > 383) { + class74.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + 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, class74.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; + class74.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); + } + + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index aed08637e5..6240a6bb3e 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,29 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dj") +@ObfuscatedName("dx") @Implements("Decimator") public class Decimator { - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1591513513 + intValue = -591203607 ) @Export("inputRate") int inputRate; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1648120479 + intValue = -772700621 ) @Export("outputRate") int outputRate; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = MouseHandler.method1111(var1, var2); + int var3 = class201.method3763(var1, var2); var1 /= var3; var2 /= var3; this.inputRate = var1; @@ -35,7 +36,7 @@ public class Decimator { for (int var4 = 0; var4 < var1; ++var4) { int[] var5 = this.table[var4]; double var6 = 6.0D + (double)var4 / (double)var1; - int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); if (var8 < 0) { var8 = 0; } @@ -46,29 +47,29 @@ public class Decimator { } for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = ((double)var8 - var6) * 3.141592653589793D; + double var12 = 3.141592653589793D * ((double)var8 - var6); double var14 = var10; if (var12 < -1.0E-4D || var12 > 1.0E-4D) { var14 = var10 * (Math.sin(var12) / var12); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); - var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); + var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); + var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); } } } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([BI)[B", - garbageValue = "992629690" + garbageValue = "2035174504" ) @Export("resample") byte[] resample(byte[] var1) { if (this.table != null) { - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; + int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; int[] var3 = new int[var2]; int var4 = 0; int var5 = 0; @@ -80,7 +81,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var7 * var8[var9]; + var3[var4 + var9] += var8[var9] * var7; } var5 += this.outputRate; @@ -106,10 +107,10 @@ public class Decimator { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-356284580" + signature = "(IB)I", + garbageValue = "65" ) @Export("scaleRate") int scaleRate(int var1) { @@ -120,167 +121,199 @@ public class Decimator { return var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "5" + signature = "(II)I", + garbageValue = "-548608122" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } return var1; } - @ObfuscatedName("c") - public static final int method2600(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (var2 != 0.0D) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (var2 + 1.0D); - } else { - var12 = var2 + var4 - var2 * var4; - } - - double var14 = var4 * 2.0D - var12; - double var16 = 0.3333333333333333D + var0; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var14 + 6.0D * (var12 - var14) * var16; - } else if (2.0D * var16 < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 1.0D) { - var8 = var14 + 6.0D * (var12 - var14) * var0; - } else if (2.0D * var0 < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = 6.0D * (var12 - var14) * var20 + var14; - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 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)(256.0D * var10); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; + @ObfuscatedName("m") + public static boolean method2635(long var0) { + return var0 != 0L && !WorldMapDecorationType.method4212(var0); } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(CI)C", - garbageValue = "2008041614" + signature = "(ILce;ZI)I", + garbageValue = "49819578" ) - public static char method2597(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); + 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("n") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "2087967382" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "458877468" ) - static final boolean method2601() { - return ViewportMouse.ViewportMouse_isInViewport; + 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 ec35ba15ee..fba3cc7fd4 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,49 +4,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("lf") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkn;" + signature = "Llf;" ) - static final DefaultsGroup field3793; - @ObfuscatedName("t") + static final DefaultsGroup field3811; + @ObfuscatedName("z") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1864717017 + intValue = 1057296275 ) @Export("group") final int group; static { - field3793 = new DefaultsGroup(3); + field3811 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(I)Lbg;", - garbageValue = "310437659" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class96.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-245092845" - ) - static final void method5953() { - 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/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 3520243c24..5a3d249892 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("ek") +@ObfuscatedName("fl") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("capacity") int capacity; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("remaining") int remaining; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljz;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lev;" + signature = "Les;" ) - class146 field1953; + class155 field1980; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lef;)V" + signature = "(Lfw;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,7 +94,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("e") + @ObfuscatedName("d") @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.field1953 != null) { - this.field1953.method3397(var5.get()); + if (this.field1980 != null) { + this.field1980.method3442(var5.get()); } } @@ -125,7 +125,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @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("g") + @ObfuscatedName("v") @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 0ab553e29d..ae6367650f 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("la") +@ObfuscatedName("mp") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2006912315 + intValue = -227672497 ) - int field3900; - @ObfuscatedName("i") + int field3923; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 713316533 + intValue = 1926127853 ) - int field3901; - @ObfuscatedName("g") + int field3919; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2074317301 + intValue = 326361045 ) - int field3902; + int field3924; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Llv;", - garbageValue = "-1317089795" + signature = "(B)Lmq;", + garbageValue = "1" ) @Export("get") public PlatformInfo get() { byte var1; - if (class160.field1998.startsWith("win")) { + if (class171.field2016.startsWith("win")) { var1 = 1; - } else if (class160.field1998.startsWith("mac")) { + } else if (class171.field2016.startsWith("mac")) { var1 = 2; - } else if (class160.field1998.startsWith("linux")) { + } else if (class171.field2016.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -133,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6331(var5); + this.method6381(var5); int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3900 > 3) { + if (this.field3923 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -150,53 +150,53 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3900, this.field3901, this.field3902, 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.field3923, this.field3919, this.field3924, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-1120202582" + garbageValue = "-974517530" ) - void method6331(String var1) { + void method6381(String var1) { if (var1.startsWith("1.")) { - this.method6323(var1); + this.method6379(var1); } else { - this.method6322(var1); + this.method6380(var1); } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "1" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-312547772" ) - void method6323(String var1) { + void method6379(String var1) { String[] var2 = var1.split("\\."); try { - this.field3900 = Integer.parseInt(var2[1]); + this.field3923 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3901 = Integer.parseInt(var2[0]); - this.field3902 = Integer.parseInt(var2[1]); + this.field3919 = Integer.parseInt(var2[0]); + this.field3924 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "-78" + garbageValue = "12" ) - void method6322(String var1) { + void method6380(String var1) { String[] var2 = var1.split("\\."); try { - this.field3900 = Integer.parseInt(var2[0]); - this.field3901 = Integer.parseInt(var2[1]); - this.field3902 = Integer.parseInt(var2[2]); + this.field3923 = Integer.parseInt(var2[0]); + this.field3919 = Integer.parseInt(var2[1]); + this.field3924 = Integer.parseInt(var2[2]); } catch (Exception var4) { } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index d86f1c68f2..6b80dd7f9b 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("bg") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("format") AudioFormat format; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("line") SourceDataLine line; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1117759731 + intValue = 1537774017 ) @Export("capacity2") int capacity2; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-111" + signature = "(I)V", + garbageValue = "-515177845" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field1398, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + 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)]; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-871749312" + garbageValue = "-1831392073" ) @Export("open") protected void open(int var1) throws LineUnavailableException { @@ -55,33 +55,27 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.open(); this.line.start(); this.capacity2 = var1; - } catch (LineUnavailableException var5) { - int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); - var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); - var4 = (var4 >>> 4) + var4 & 252645135; - var4 += var4 >>> 8; - var4 += var4 >>> 16; - int var3 = var4 & 255; - if (var3 != 1) { - this.open(DynamicObject.method2293(var1)); + } catch (LineUnavailableException var3) { + if (Clock.method3590(var1) != 1) { + this.open(Calendar.method4033(var1)); } else { this.line = null; - throw var5; + throw var3; } } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-164846701" + garbageValue = "-1722515255" ) @Export("position") protected int position() { return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("write") protected void write() { int var1 = 256; @@ -102,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1942741652" + signature = "(B)V", + garbageValue = "-100" ) @Export("close") protected void close() { @@ -116,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2088617942" + garbageValue = "-801705902" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 77cde643f6..82b0ff2a9b 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -3,40 +3,117 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("bd") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class99 { - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Llc;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - +public class DevicePcmPlayerProvider implements class108 { DevicePcmPlayerProvider() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Ldw;", - garbageValue = "-1842325799" + garbageValue = "65536" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1589308129" + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-989870675" ) - public static void method855() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } + public static String method948(CharSequence var0) { + String var1 = Buffer.base37DecodeLong(NetCache.method4400(var0)); + if (var1 == null) { + var1 = ""; } + 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; + } else { + return var0.activity.compareTo(var1.activity); + } + } 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; + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1003949082" + ) + static final void method946(String var0) { + GrandExchangeEvent.method165(var0 + " is already on your friend list"); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "137174344" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + if (var2 > 192) { + var1 /= 2; + } + + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 9e8b6f9d10..d4b3daf9ad 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,36 +4,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("hl") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("v") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lli;" + signature = "Lla;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("c") + @Export("rightTitleSprite") + static Sprite rightTitleSprite; + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("x") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "-571467457" + garbageValue = "1422436059" ) @Export("get") - public byte[] get() { + byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; this.directBuffer.position(0); this.directBuffer.get(var1); return var1; } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "1471312739" + signature = "([BB)V", + garbageValue = "0" ) @Export("set") public void set(byte[] var1) { @@ -41,61 +47,4 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.position(0); this.directBuffer.put(var1); } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "19" - ) - public static void method4006(int var0, int var1) { - VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var8 = class287.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitDefinition(); - if (var8 != null) { - var3.decode(new Buffer(var8)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - int var4 = var2.baseVar; - int var5 = var2.startBit; - int var6 = var2.endBit; - int var7 = Varps.Varps_masks[var6 - var5]; - if (var1 < 0 || var1 > var7) { - var1 = 0; - } - - var7 <<= var5; - Varps.Varps_main[var4] = Varps.Varps_main[var4] & ~var7 | var1 << var5 & var7; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-186978734" - ) - static boolean method4004(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-470893406" - ) - public static int method4012(String var0) { - return var0.length() + 2; - } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index eb1c9f8fe4..8ef9590906 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("eb") +@ObfuscatedName("fk") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("t") + @ObfuscatedName("m") @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 db824a2ce3..0e697e34f8 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("fa") +@ObfuscatedName("ge") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("ce") + @ObfuscatedName("cz") @Export("keyDual") public long keyDual; - @ObfuscatedName("cw") + @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cq") + @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("ca") + @ObfuscatedName("cz") @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 b504bd0901..c5a66c0d62 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("jq") +@ObfuscatedName("jl") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfa;)V" + signature = "(Lge;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lfa;)V" + signature = "(Lge;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lfa;" + signature = "()Lge;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ca909e30c7..bb4a7d2de8 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,72 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cv") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1669181917 + intValue = -778595855 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -433017079 + intValue = 1719688801 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -857154587 + intValue = 1645761999 ) @Export("orientation") int orientation; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1092550967 + intValue = -1021480433 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -660680399 + intValue = 1939594765 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 74739559 + intValue = 456415143 ) @Export("y") int y; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lip;" + signature = "Ljc;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1110728841 + intValue = -2053050533 ) @Export("frame") int frame; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1571006873 + intValue = 1933430481 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLeq;)V" + signature = "(IIIIIIIZLee;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -79,10 +73,10 @@ public class DynamicObject extends Entity { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var7); + this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3516 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field3525 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; if (this.sequenceDefinition == var10.sequenceDefinition) { this.frame = var10.frame; @@ -99,10 +93,10 @@ public class DynamicObject extends Entity { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { @@ -112,11 +106,11 @@ public class DynamicObject extends Entity { var1 = 100; } - label57: { + label55: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label57; + break label55; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -132,7 +126,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = Occluder.getObjectDefinition(this.id); + ObjectDefinition var12 = WorldMapSection2.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -155,74 +149,34 @@ 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][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; + int var9 = var8[var4][var7] + var8[var5][var6] + var8[var4][var6] + var8[var5][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "2" + signature = "(ILlq;Lih;I)V", + garbageValue = "-389102765" ) - public static int method2293(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Lkp;J)V" - ) - static void method2291(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; + 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; + } + } } - var0.writeShort((int)var1); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1735804307" - ) - public static void method2292() { - Huffman.SpriteBuffer_xOffsets = null; - NPC.SpriteBuffer_yOffsets = null; - class326.SpriteBuffer_spriteWidths = null; - class326.SpriteBuffer_spriteHeights = null; - class326.SpriteBuffer_spritePalette = null; - class326.SpriteBuffer_pixels = null; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-75" - ) - static final int method2286(int var0, int var1) { - if (var0 == -1) { - return 12345678; + if (var3 != null) { + var2.load(var1, var0, var3, true); } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); } } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 1f4e10d2dc..6968fbee4b 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -4,23 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ee") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("nj") - @ObfuscatedSignature( - signature = "[Lhn;" - ) - static Widget[] field1866; - @ObfuscatedName("gj") - @ObfuscatedSignature( - signature = "Llt;" - ) - @Export("compass") - static Sprite compass; - @ObfuscatedName("cy") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -384609857 + intValue = 566997565 ) @Export("height") public int height; @@ -29,17 +18,17 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("cn") + @ObfuscatedName("cq") @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(); @@ -50,21 +39,38 @@ public abstract class Entity extends DualNode { } - @ObfuscatedName("fr") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-553494705" + signature = "(II)Z", + garbageValue = "-1030899417" ) - static final void method3332() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; + public static boolean method3374(int var0) { + return var0 >= WorldMapDecorationType.field2719.id && var0 <= WorldMapDecorationType.field2739.id; + } - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - ScriptFrame.updateActorSequence(var3, 1); + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([BILjava/lang/CharSequence;I)I", + garbageValue = "-304633818" + ) + public static int method3372(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } } + return var4 - var1; } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 3a5c85d35f..cf4ecef07b 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,43 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("ji") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leh;" + signature = "Liy;" + ) + @Export("EnumDefinition_archive") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Leg;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("inputType") public char inputType; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("outputType") public char outputType; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 763609869 + intValue = 1168542031 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1620263743 + intValue = 744835807 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("keys") public int[] keys; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("intVals") public int[] intVals; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("strVals") public String[] strVals; @@ -53,10 +59,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-1295672156" + signature = "(Lkb;I)V", + garbageValue = "1803562371" ) @Export("decode") void decode(Buffer var1) { @@ -70,10 +76,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "1239403484" + signature = "(Lkb;II)V", + garbageValue = "-1795608149" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -110,61 +116,45 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1222306007" + garbageValue = "1493924915" ) @Export("size") public int size() { return this.outputCount; } - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)Les;", - garbageValue = "-1471944994" + signature = "(II)V", + garbageValue = "-530273467" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = Canvas.SequenceDefinition_animationsArchive; - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); + 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 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 < 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; } } - - 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; } } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 9e7073f6f7..b556511eed 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("gq") +@ObfuscatedName("go") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index f47552c803..b17746deeb 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("eh") +@ObfuscatedName("eg") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) - DualNode field1950; - @ObfuscatedName("t") + DualNode field1973; + @ObfuscatedName("m") @Export("capacity") int capacity; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljz;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1950 = new DualNode(); + this.field1973 = 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("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(J)Lfa;" + signature = "(J)Lge;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lfa;J)V" + signature = "(Lge;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.field1950) { + if (var4 == this.field1973) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1950 = new DualNode(); + this.field1973 = 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 dd0e371689..c38bbdfe5b 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,24 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("er") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("c") + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = 1677646269 + intValue = -98471287 ) - @Export("x") - int x; - @ObfuscatedName("t") + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 531566341 + intValue = 62688093 ) @Export("y") int y; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1439819501 + intValue = 152436141 + ) + @Export("x") + int x; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 567855277 ) @Export("z") int z; @@ -29,69 +35,142 @@ public class FaceNormal { FaceNormal() { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lii;Lii;III)Lko;", - garbageValue = "1973799897" + signature = "(Lgn;Llp;I)Lgq;", + garbageValue = "-1746993437" ) - public static Font method3335(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - if (!class228.method4199(var0, var2, var3)) { - return null; + @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 { - byte[] var5 = var1.takeFile(var2, var3); - Font var4; - if (var5 == null) { - var4 = null; - } else { - Font var6 = new Font(var5, Huffman.SpriteBuffer_xOffsets, NPC.SpriteBuffer_yOffsets, class326.SpriteBuffer_spriteWidths, class326.SpriteBuffer_spriteHeights, class326.SpriteBuffer_spritePalette, class326.SpriteBuffer_pixels); - DynamicObject.method2292(); - var4 = var6; + var2.packetBuffer = new PacketBuffer(260); + } + + 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'; } - return var4; + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else { + return var0 == 376 ? 'Y' : var0; } } - @ObfuscatedName("t") + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(ILiy;IIIZB)V", + garbageValue = "-88" + ) + @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 = "2042389443" + garbageValue = "2112938441" ) - public static boolean method3334() { - ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); - return var0 != null; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Lii;Ljava/lang/String;Ljava/lang/String;I)[Lli;", - garbageValue = "326479912" - ) - public static IndexedSprite[] method3336(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite[] var5; - if (!class228.method4199(var0, var3, var4)) { - var5 = null; - } else { - IndexedSprite[] var7 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (int var8 = 0; var8 < class326.SpriteBuffer_spriteCount; ++var8) { - IndexedSprite var9 = var7[var8] = new IndexedSprite(); - var9.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var9.height = class326.SpriteBuffer_spriteHeight; - var9.xOffset = Huffman.SpriteBuffer_xOffsets[var8]; - var9.yOffset = NPC.SpriteBuffer_yOffsets[var8]; - var9.subWidth = class326.SpriteBuffer_spriteWidths[var8]; - var9.subHeight = class326.SpriteBuffer_spriteHeights[var8]; - var9.palette = class326.SpriteBuffer_spritePalette; - var9.pixels = class326.SpriteBuffer_pixels[var8]; - } - - DynamicObject.method2292(); - var5 = var7; - } - - return var5; + public static boolean method3379() { + return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 927d0c5c2a..51fbe5358d 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -5,39 +5,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fe") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("pk") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("FileSystem_hasPermissions") - static boolean FileSystem_hasPermissions; - @ObfuscatedName("t") + public static boolean FileSystem_hasPermissions; + @ObfuscatedName("m") @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("o") + public static File FileSystem_cacheDir; + @ObfuscatedName("k") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgk;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-1674158829" + signature = "(IIB)Z", + garbageValue = "-28" ) - static boolean method3572(int var0, int var1) { - return var0 != 4 || var1 < 8; + 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/FillMode.java b/runescape-client/src/main/java/FillMode.java deleted file mode 100644 index f8342516d3..0000000000 --- a/runescape-client/src/main/java/FillMode.java +++ /dev/null @@ -1,54 +0,0 @@ -import 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("lf") -@Implements("FillMode") -public enum FillMode implements Enumerated { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Llf;" - ) - @Export("SOLID") - SOLID(0, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Llf;" - ) - field3858(1, 1), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Llf;" - ) - field3854(2, 2); - - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -999027833 - ) - @Export("value") - public final int value; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2109460743 - ) - @Export("id") - final int id; - - FillMode(int var3, int var4) { - this.value = var3; - this.id = var4; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } -} diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 107a70affa..199dbb498a 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,53 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("eo") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("ja") - @ObfuscatedSignature( - signature = "Lhn;" - ) - static Widget field1604; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -340818917 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2029727385 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -588436191 + intValue = -1588480469 ) @Export("y") int y; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Leq;" - ) - @Export("entity") - public Entity entity; - @ObfuscatedName("i") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -1449564120774695343L + longValue = -6831837537966124847L ) @Export("tag") public long tag; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1732648277 + intValue = -198900691 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1743466221 + ) + @Export("x") + int x; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lee;" + ) + @Export("entity") + public Entity entity; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1370776167 ) @Export("flags") int flags; @@ -58,48 +47,22 @@ public final class FloorDecoration { FloorDecoration() { } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Llp;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1267809906" + signature = "(IIB)V", + garbageValue = "-95" ) - static String method2914(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("o") - @ObfuscatedSignature( - signature = "(IIIIIIB)I", - garbageValue = "94" - ) - public static int method2913(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; + 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; } - 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); - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-2102248580" - ) - static final void method2912(String var0) { - class60.method1188("Please remove " + var0 + " from your friend list first"); + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 651915b703..15cf07225a 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("ig") +@ObfuscatedName("jn") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 935951655 + intValue = -1157024387 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1095526673 + intValue = 512679167 ) @Export("texture") public int texture; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1729092423 + intValue = -1191999743 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -29355705 + intValue = 273345835 ) @Export("hue") public int hue; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1250783645 + intValue = 1834266941 ) @Export("saturation") public int saturation; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1922537883 + intValue = 1392901101 ) @Export("lightness") public int lightness; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 291644117 + intValue = 1368031931 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1538627711 + intValue = -1913373455 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1197825263 + intValue = 262091387 ) @Export("secondaryLightness") public int secondaryLightness; @@ -88,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "342799854" + garbageValue = "-1555097959" ) @Export("postDecode") void postDecode() { @@ -105,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "-45" + signature = "(Lkb;II)V", + garbageValue = "-1372531887" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;IIB)V", - garbageValue = "16" + signature = "(Lkb;IIB)V", + garbageValue = "109" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1731410531" + garbageValue = "-726592820" ) @Export("setHsl") void setHsl(int var1) { @@ -184,17 +184,17 @@ public class FloorOverlayDefinition extends DualNode { if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { + } else if (var4 == var10) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -209,643 +209,26 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("iy") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Lhn;IIIIIIIIB)V", - garbageValue = "40" + signature = "(IB)Ljq;", + garbageValue = "6" ) - @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 || !VarcInt.isComponentHidden(var10)) { - if (var10.contentType > 0) { - GrandExchangeEvent.method93(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) { - Entity.field1866 = var0; - WorldMapIcon_0.field142 = var6; - UserComparator9.field1965 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field824) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field919) { - var15 = Client.field919; - } - - if (var15 + var10.width > Client.field919 + Client.clickedWidgetParent.width) { - var15 = Client.field919 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field826) { - var16 = Client.field826; - } - - if (var16 + var10.height > Client.field826 + Client.clickedWidgetParent.height) { - var16 = Client.field826 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var20; - int var21; - int var22; - int var30; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var30 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var30 > var2 ? var30 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var30 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var30 < var4 ? var30 : 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; - class13.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var38 = Runtime.getRuntime(); - var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - class13.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - WorldMapSection1.drawEntities(var12, var13, var10.width, var10.height); - Client.field851[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - WorldMapRegion.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - UserComparator8.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - WorldMapIcon_0.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - WorldMapIcon_0.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - WorldMapLabelSize.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && VarcInt.isComponentHidden(var10) && var10 != GrandExchangeOfferUnitPriceComparator.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 var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var19 != null) { - ServerPacket.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field853[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - WorldMapRectangle.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) { - var30 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var21 * (var10.paddingX + 32) + var12; - var23 = var20 * (var10.paddingY + 32) + var13; - if (var30 < 20) { - var22 += var10.inventoryXOffsets[var30]; - var23 += var10.inventoryYOffsets[var30]; - } - - if (var10.itemIds[var30] <= 0) { - if (var10.inventorySprites != null && var30 < 20) { - Sprite var46 = var10.getInventorySprite(var30); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } - } else { - boolean var39 = false; - boolean var40 = false; - var26 = var10.itemIds[var30] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - Sprite var35; - if (Client.isItemSelected == 1 && var30 == class65.selectedItemSlot && var10.id == FriendSystem.selectedItemWidget) { - var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); - } else { - var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); - } - - if (var35 != null) { - if (var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var35.drawTransAt(var22 + var24, var25 + var23, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field707 / 3; - if (var29 > Client.field707 * 10) { - var29 = Client.field707 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - NPCDefinition.invalidateWidget(var28); - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field707 / 3; - if (var29 > Client.field707 * 10) { - var29 = Client.field707 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - NPCDefinition.invalidateWidget(var28); - } - } - } else if (var10 == Skeleton.field1793 && var30 == Client.field752) { - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); - } - } else { - NPCDefinition.invalidateWidget(var10); - } - } - } - - ++var30; - } - } - } else if (var10.type == 3) { - if (ScriptFrame.runCs1(var10)) { - var30 = var10.color2; - if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var30 = var10.mouseOverColor2; - } - } else { - var30 = var10.color; - if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var30 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.value) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } else { - Font var36; - if (var10.type == 4) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } else { - String var43 = var10.text; - if (ScriptFrame.runCs1(var10)) { - var20 = var10.color2; - if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var43 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var47 = HealthBarDefinition.ItemDefinition_get(var10.itemId); - var43 = var47.name; - if (var43 == null) { - var43 = "null"; - } - - if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var43 = PacketWriter.colorStartTag(16748608) + var43 + "" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var43 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var43 = MouseHandler.method1096(var43, var10); - } - - var36.drawLines(var43, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else if (var10.type == 5) { - Sprite var37; - if (!var10.isIf3) { - var37 = var10.getSprite(ScriptFrame.runCs1(var10)); - if (var37 != null) { - var37.drawTransBgAt(var12, var13); - } else if (Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var37 = AttackOption.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var37 = var10.getSprite(false); - } - - if (var37 == null) { - if (Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } else { - var20 = var37.width; - var21 = var37.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var37.method6210(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var37.drawTransBgAt(var12, var13); - } else { - var37.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) { - var37.method6210(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var37.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var37.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var32; - if (var10.type == 6) { - boolean var44 = ScriptFrame.runCs1(var10); - if (var44) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var32 = HealthBarDefinition.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 { - NPCDefinition.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class192.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var44, class192.localPlayer.appearance); - if (var41 == null && Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } else { - SequenceDefinition var45 = GraphicsDefaults.SequenceDefinition_get(var20); - var41 = var10.getModel(var45, var10.modelFrame, var44, class192.localPlayer.appearance); - if (var41 == null && Widget.field2697) { - NPCDefinition.invalidateWidget(var10); - } - } - - Rasterizer3D.method3101(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.method2946(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method2938(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method2946(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2697) { - NPCDefinition.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 = HealthBarDefinition.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = PacketWriter.colorStartTag(16748608) + var32.name + ""; - } else { - var34 = PacketWriter.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = (var10.paddingY + 12) * var21 + var13; - if (var10.textXAlignment == 0) { - var36.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var36.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var36.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == VarbitDefinition.field3296 && Client.field796 == Client.field797) { - var30 = 0; - var20 = 0; - Font var31 = class13.fontPlain12; - String var33 = var10.text; - - String var42; - for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var33.indexOf("
"); - if (var24 != -1) { - var42 = var33.substring(0, var24); - var33 = var33.substring(var24 + 4); - } else { - var42 = var33; - var33 = ""; - } - - var25 = var31.stringWidth(var42); - if (var25 > var30) { - var30 = var25; - } - } - - var30 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var30; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var30 > var4) { - var24 = var4 - var30; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); - var33 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var26 = var26 + var31.ascent + 1) { - int var27 = var33.indexOf("
"); - if (var27 != -1) { - var42 = var33.substring(0, var27); - var33 = var33.substring(var27 + 4); - } else { - var42 = var33; - var33 = ""; - } - - var31.draw(var42, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2606) { - var30 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); - } else { - GrandExchangeOfferWorldComparator.method74(var30, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } - } + @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; } - - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-825352084" - ) - public static boolean method4835() { - return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 3359af3b59..cd20bd1079 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("if") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("FloorUnderlayDefinition_archive") - static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("t") + public static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 324274119 + intValue = -982291311 ) @Export("rgb") int rgb; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 38778911 + intValue = 1361572975 ) @Export("hue") public int hue; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -974835439 + intValue = -932748815 ) @Export("saturation") public int saturation; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1002192481 + intValue = -26214431 ) @Export("lightness") public int lightness; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1556624477 + intValue = -667494965 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-667447338" + garbageValue = "1794462402" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "34" + signature = "(Lkb;II)V", + garbageValue = "1422019917" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -85,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;IIB)V", - garbageValue = "-93" + signature = "(Lkb;III)V", + garbageValue = "-1237610564" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "15" + signature = "(II)V", + garbageValue = "2124532512" ) @Export("setHsl") void setHsl(int var1) { @@ -131,14 +131,14 @@ public class FloorUnderlayDefinition extends DualNode { double var16 = (var10 + var8) / 2.0D; if (var10 != var8) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var8 + var10); + var14 = (var10 - var8) / (var10 + var8); } if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; @@ -148,7 +148,7 @@ public class FloorUnderlayDefinition extends DualNode { } var12 /= 6.0D; - this.saturation = (int)(var14 * 256.0D); + this.saturation = (int)(256.0D * var14); this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; @@ -175,127 +175,14 @@ public class FloorUnderlayDefinition extends DualNode { this.hue = (int)(var12 * (double)this.hueMultiplier); } - @ObfuscatedName("t") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(CLgl;I)C", - garbageValue = "-291129938" + signature = "(Liy;Ljava/lang/String;Ljava/lang/String;I)[Lla;", + garbageValue = "-1984453529" ) - @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("if") - @ObfuscatedSignature( - signature = "([Lhn;IIIZB)V", - garbageValue = "1" - ) - @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) { - UrlRequester.alignWidgetSize(var6, var2, var3, var4); - InterfaceParent.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_1.revalidateWidgetScroll(var0, var6, var4); - } - } - } - + 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); } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index aefb563534..9f6c93be74 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("ko") +@ObfuscatedName("kx") @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("c") + @ObfuscatedName("x") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @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 6e13091a53..67fbf5963e 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,70 +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("kq") +@ObfuscatedName("ka") @Implements("FontName") public class FontName { - @ObfuscatedName("qm") - @ObfuscatedGetter( - intValue = -1887929743 - ) - static int field3660; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("eh") - @ObfuscatedGetter( - intValue = -1770194779 + @ObfuscatedName("do") + @ObfuscatedSignature( + signature = "Lih;" ) - static int field3650; - @ObfuscatedName("gt") - @ObfuscatedGetter( - intValue = -1472159493 - ) - static int field3663; - @ObfuscatedName("lo") - @ObfuscatedGetter( - intValue = 1238804293 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("d") + @Export("archive4") + static Archive archive4; + @ObfuscatedName("q") @Export("name") String name; @@ -81,21 +66,143 @@ public class FontName { this.name = var1; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)[Lka;", + garbageValue = "-2101151753" ) - public static int method5401() { - return KeyHandler.KeyHandler_idleCycles; + public static FontName[] method5387() { + return new FontName[]{FontName_bold12, FontName_verdana13, FontName_verdana11, FontName_plain11, FontName_plain12, FontName_verdana15}; } - @ObfuscatedName("l") + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "-1439449778" + ) + 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; + } 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; + } + + var0.field2555 = new byte[11][]; + var0.field2643 = new byte[11][]; + var0.field2644 = new int[11]; + var0.field2695 = new int[11]; + } + + var0.field2555[var1] = var2; + if (var2 != null) { + var0.field2641 = true; + } else { + var0.field2641 = false; + + for (int var4 = 0; var4 < var0.field2555.length; ++var4) { + if (var0.field2555[var4] != null) { + var0.field2641 = true; + break; + } + } + } + + 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") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1505118855" + garbageValue = "78601767" ) - public static void method5402() { - KitDefinition.KitDefinition_cached.clear(); + @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(); + } + } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 64c6fcac86..0078e76afa 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,37 +1,30 @@ import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("kf") @Implements("Fonts") public class Fonts { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 902886517 - ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("map") HashMap map; @ObfuscatedSignature( - signature = "(Lii;Lii;)V" + signature = "(Liy;Liy;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -39,10 +32,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([Lkq;I)Ljava/util/HashMap;", - garbageValue = "-448655147" + signature = "([Lka;I)Ljava/util/HashMap;", + garbageValue = "-1813664222" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -54,12 +47,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractArchive var7 = this.spritesArchive; - AbstractArchive var8 = this.fontsArchive; - String var9 = var5.name; - int var10 = var7.getGroupId(var9); - int var11 = var7.getFileId(var10, ""); - Font var6 = FaceNormal.method3335(var7, var8, var10, var11); + Font var6 = class39.method647(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -69,27 +57,4 @@ public class Fonts { return var2; } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(II)Lit;", - garbageValue = "291132223" - ) - @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; - } - } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index e6dee1dada..d6580ed87f 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,30 +1,20 @@ -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("es") +@ObfuscatedName("ef") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("l") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = -1849974283 - ) - static int field1885; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Ldh;" + signature = "[Leh;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lii;Lii;IZ)V", + signature = "(Liy;Liy;IZ)V", garbageValue = "0" ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { @@ -56,43 +46,60 @@ public class Frames extends DualNode { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1402532864" + garbageValue = "861900150" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "([BS)Ljava/lang/String;", - garbageValue = "255" + signature = "(Lih;IIIBZI)V", + garbageValue = "-626508532" ) - public static String method3340(byte[] var0) { - int var2 = var0.length; - StringBuilder var3 = new StringBuilder(); + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; + } - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class290.field3646[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class290.field3646[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class290.field3646[(var6 & 15) << 2 | var7 >>> 6]).append(class290.field3646[var7 & 63]); } else { - var3.append(class290.field3646[(var6 & 15) << 2]).append("="); + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; + } + } + + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; + } + } - } else { - var3.append(class290.field3646[(var5 & 3) << 4]).append("=="); } } - - String var1 = var3.toString(); - return var1; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index ab2689980c..6b981174b3 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,23 +1,29 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("ky") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("c") - boolean field3618; - @ObfuscatedName("t") - boolean field3619; + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = -1119785599 + ) + static int field3626; + @ObfuscatedName("x") + boolean field3625; + @ObfuscatedName("m") + boolean field3623; Friend() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljy;S)I", - garbageValue = "30306" + signature = "(Lky;I)I", + garbageValue = "-1645564523" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +35,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3618 && !var1.field3618) { + } else if (this.field3625 && !var1.field3625) { return -1; - } else if (!this.field3618 && var1.field3618) { + } else if (!this.field3625 && var1.field3625) { return 1; - } else if (this.field3619 && !var1.field3619) { + } else if (this.field3623 && !var1.field3623) { return -1; - } else if (!this.field3619 && var1.field3619) { + } else if (!this.field3623 && var1.field3623) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("az") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljk;I)I", - garbageValue = "-746331144" + signature = "(Ljd;I)I", + garbageValue = "-1956183743" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -55,14 +61,4 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } - - @ObfuscatedName("gm") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1214522869" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 4a5ba74b15..52ae63de05 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,96 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("ki") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgl;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 625683847 + intValue = 1923420853 ) - public int field3632; - @ObfuscatedName("e") + public int field3636; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lku;" ) @Export("username") public Username username; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Ljz;I)V" + signature = "(Lku;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3632 = (int)(WorldMapIcon_0.currentTimeMillis() / 1000L); + this.field3636 = (int)(class217.currentTimeMillis() / 1000L); this.username = var1; this.world = (short)var2; } - - @ObfuscatedName("c") - public static final void method5325(long var0) { - if (var0 > 0L) { - if (var0 % 10L == 0L) { - World.method1801(var0 - 1L); - World.method1801(1L); - } else { - World.method1801(var0); - } - - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIII)V", - garbageValue = "2127417563" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1669041813" - ) - public static boolean method5326(int var0) { - return (var0 >> 29 & 1) != 0; - } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 0397ab9067..9b7e7d67fb 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,102 +3,91 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("co") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = -1970559655 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -1654190039 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("e") + @ObfuscatedName("u") + static int[] field1086; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Lkr;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Ljb;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -154816357 + intValue = 429745001 ) - int field1063; + int field1092; @ObfuscatedSignature( - signature = "(Lmv;)V" + signature = "(Lmx;)V" ) FriendSystem(LoginType var1) { - this.field1063 = 0; + this.field1092 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1947292888" + garbageValue = "-1209289020" ) - boolean method1857() { - return this.field1063 == 2; + boolean method1952() { + return this.field1092 == 2; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1940001821" + signature = "(B)V", + garbageValue = "104" ) - final void method1858() { - this.field1063 = 1; + final void method1953() { + this.field1092 = 1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "224283434" + signature = "(Lkb;II)V", + garbageValue = "1535812566" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1063 = 2; - WorldMapID.FriendSystem_invalidateFriends(); + this.field1092 = 2; + class236.FriendSystem_invalidateFriends(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "291777380" + garbageValue = "-1051336580" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3632 < WorldMapIcon_0.currentTimeMillis() / 1000L - 5L) { + if ((long)var1.field3636 < class217.currentTimeMillis() / 1000L - 5L) { if (var1.world > 0) { - ClientPreferences.addGameMessage(5, "", var1.username + " has logged in."); + Skeleton.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - ClientPreferences.addGameMessage(5, "", var1.username + " has logged out."); + Skeleton.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -107,38 +96,38 @@ public class FriendSystem { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1660346454" + garbageValue = "-589542332" ) @Export("clear") final void clear() { - this.field1063 = 0; + this.field1092 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljz;ZI)Z", - garbageValue = "1100778689" + signature = "(Lku;ZI)Z", + garbageValue = "-1932720892" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(class192.localPlayer.username)) { + } else if (var1.equals(ByteArrayPool.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljz;I)Z", - garbageValue = "819479662" + signature = "(Lku;B)Z", + garbageValue = "-60" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -149,10 +138,10 @@ public class FriendSystem { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-340804777" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-36" ) @Export("addFriend") final void addFriend(String var1) { @@ -160,16 +149,16 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - WorldMapArea.method425(); - } else if (class192.localPlayer.username.equals(var2)) { - WorldMapLabel.method439(); + LoginPacket.method3692(); + } else if (ByteArrayPool.localPlayer.username.equals(var2)) { + GrandExchangeEvent.method165("You can't add yourself to your own friend list"); } else if (this.isFriended(var2, false)) { - LoginScreenAnimation.method1837(var1); + DevicePcmPlayerProvider.method946(var1); } else if (this.isIgnored(var2)) { - Calendar.method4014(var1); + ClientPreferences.method1950(var1); } else { - PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -180,17 +169,17 @@ public class FriendSystem { @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1302160469" + garbageValue = "2128609566" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field763 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field798 != 1; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1143439097" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-110" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -198,34 +187,37 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - class60.method1188("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } else if (class192.localPlayer.username.equals(var2)) { - class80.method2097(); + 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(); } else if (this.isIgnored(var2)) { - ModelData0.method3323(var1); + GrandExchangeEvent.method165(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - FloorDecoration.method2912(var1); + class195.method3696(var1); } else { - class43.method817(var1); + PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } } } } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1820924219" + signature = "(B)Z", + garbageValue = "-46" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field763 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field798 != 1; } @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "561828243" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-31" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -233,22 +225,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Client.field839 = Client.cycleCntr; - PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + Clock.method3599(); + PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - WorldMapID.FriendSystem_invalidateFriends(); + class236.FriendSystem_invalidateFriends(); } } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-892672688" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-29" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -256,65 +248,26 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - Client.field839 = Client.cycleCntr; - PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + Clock.method3599(); + PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - class96.FriendSystem_invalidateIgnoreds(); + FontName.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("af") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljz;I)Z", - garbageValue = "431116625" + signature = "(Lku;I)Z", + garbageValue = "-407468573" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { Friend var2 = (Friend)this.friendsList.getByUsername(var1); return var2 != null && var2.hasWorld(); } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "0" - ) - static int method1920(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 5b9c502ca9..a5d697db35 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,64 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("kr") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("ge") - @Export("regions") - static int[] regions; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1784077363 + intValue = -975708825 ) - int field3606; - @ObfuscatedName("p") + int field3618; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljr;" + signature = "Ljk;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Lmv;)V" + signature = "(Lmx;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3606 = 1; + this.field3618 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)Ljk;", - garbageValue = "30683" + signature = "(I)Ljd;", + garbageValue = "-1332552421" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)[Ljk;", - garbageValue = "19" + signature = "(II)[Ljd;", + garbageValue = "-667029686" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljz;ZI)Z", - garbageValue = "-1382316514" + signature = "(Lku;ZI)Z", + garbageValue = "-141392117" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -73,10 +70,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "118" + signature = "(Lkb;IB)V", + garbageValue = "51" ) @Export("read") public void read(Buffer var1, int var2) { @@ -140,17 +137,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { - var11.int2 = ++this.field3606 - 1; + var11.int2 = ++this.field3618 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 1598123503) * 179134735; + var11.int2 = -(var11.int2 * -1563374063) * 1414783729; } var11.world = var6; } var11.rank = var7; - var11.field3618 = var9; - var11.field3619 = var10; + var11.field3625 = var9; + var11.field3623 = var10; continue; } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 581241acee..9bf4df67d5 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,33 +1,22 @@ import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("mw") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -145527417 + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Liy;" ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 443544687 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("c") + @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" @@ -35,10 +24,14 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("c") + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;[BI)V", - garbageValue = "163268169" + signature = "(Lkb;[BI)V", + garbageValue = "-631538696" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 60a28d5506..3134204187 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,92 +1,103 @@ +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("ea") +@ObfuscatedName("ek") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -940773831 - ) - @Export("plane") - int plane; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2132625949 - ) - @Export("height") - int height; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -2072532473 - ) - @Export("centerX") - int centerX; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1479439291 + intValue = -1812382241 ) @Export("centerY") int centerY; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Leq;" - ) - @Export("entity") - public Entity entity; - @ObfuscatedName("g") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -638708115 + intValue = 1894508257 ) @Export("orientation") int orientation; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -67995329 + ) + @Export("plane") + int plane; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1848719161 + intValue = -1055464323 + ) + @Export("height") + int height; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 733420337 + ) + @Export("centerX") + int centerX; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lee;" + ) + @Export("entity") + public Entity entity; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1786771811 ) @Export("startX") int startX; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1367330545 + intValue = 983334103 ) @Export("endX") int endX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 170965517 + intValue = 364744081 ) @Export("startY") int startY; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -281386629 + intValue = 1023700223 ) @Export("endY") int endY; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1872697875 + ) + int field1950; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 459315211 - ) - int field1931; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1057625291 + intValue = -623014369 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 3023307687483633369L + longValue = 1416033697273847883L ) @Export("tag") public long tag; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1037464563 + intValue = 837500395 ) @Export("flags") int flags; @@ -96,120 +107,292 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Liw;", - garbageValue = "-1799291125" + signature = "(Ljava/io/File;Ljava/io/File;S)V", + garbageValue = "1603" ) - @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 = GrandExchangeOfferAgeComparator.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + 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(""); } - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; + var2.write(var3.array, 0, var3.offset); + var2.close(); + } catch (IOException var4) { + var4.printStackTrace(); } + } - @ObfuscatedName("fk") - @ObfuscatedSignature( - signature = "(Lip;IIII)V", - garbageValue = "-1299121306" - ) - @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; + @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("ij") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "101" + signature = "(Lkj;I)V", + garbageValue = "-137749117" ) - static void method3360() { - int var0; - int var2; - int var3; - for (var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - var2 = Client.menuOpcodes[var0]; - boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; - if (var1) { - if (var0 < Client.menuOptionsCount - 1) { - for (var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { - Client.menuActions[var3] = Client.menuActions[var3 + 1]; - Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; - Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; - Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; - Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; - Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; - Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; + @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; - --Client.menuOptionsCount; } + + var0.writeCrc(var2); + var1.remove(); } + } - var0 = InterfaceParent.menuWidth / 2 + ArchiveDiskAction.menuX; - int var6 = SecureRandomCallable.menuY; - var2 = class1.fontBold12.stringWidth("Choose Option"); + @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; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - var4 = class1.fontBold12.stringWidth(VerticalAlignment.method4426(var3)); - if (var4 > var2) { - var2 = 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(); + } } - } - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - var4 = var0 - var2 / 2; - if (var4 + var2 > Username.canvasWidth) { - var4 = Username.canvasWidth - var2; - } + 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; + } - if (var4 < 0) { var4 = 0; - } - int var5 = var6; - if (var3 + var6 > WorldMapData_1.canvasHeight) { - var5 = WorldMapData_1.canvasHeight - var3; - } + 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; + } + } + } - if (var5 < 0) { + 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); } - ArchiveDiskAction.menuX = var4; - SecureRandomCallable.menuY = var5; - InterfaceParent.menuWidth = var2; - Message.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index bd48217c00..62ca6d9679 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -17,6 +17,7 @@ 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.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -24,175 +25,164 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("br") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lff;" - ) - @Export("taskHandler") - protected static TaskHandler taskHandler; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lbf;" + signature = "Lbr;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 196022413 + intValue = 1209606099 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 528235064491181747L + longValue = -6369657706537563035L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1437299021 + intValue = -513334835 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1661201835 + intValue = -906950437 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 71022173 + intValue = -1495509389 ) @Export("fps") protected static int fps; - @ObfuscatedName("p") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfb;" ) @Export("clock") - static Clock clock; - @ObfuscatedName("v") + protected static Clock clock; + @ObfuscatedName("h") @Export("graphicsTickTimes") - static long[] graphicsTickTimes; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1251279017 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("k") + protected static long[] graphicsTickTimes; + @ObfuscatedName("i") @Export("clientTickTimes") - static long[] clientTickTimes; - @ObfuscatedName("ax") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; + protected static long[] clientTickTimes; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -2072327309 + intValue = 1546513763 ) - static int field467; - @ObfuscatedName("ao") + static int field491; + @ObfuscatedName("az") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ag") + @ObfuscatedName("aj") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("ay") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("ad") @ObfuscatedGetter( - longValue = 8963656007047949345L + longValue = -1164491573273793773L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedGetter( - longValue = 9016661795378889985L + longValue = 6497847362101811913L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("bw") - static String field477; - @ObfuscatedName("g") + @ObfuscatedName("z") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1999078243 + intValue = 1556533671 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("f") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1778726039 + intValue = -1571730911 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1382967399 + intValue = -1057349717 ) @Export("canvasX") int canvasX; - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2050862529 + intValue = -198261897 ) @Export("canvasY") int canvasY; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2042423139 + intValue = 347663265 ) - int field459; + int field475; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 96857059 + intValue = 618283515 ) - int field464; - @ObfuscatedName("af") + int field488; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -460678809 + intValue = 1006498509 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 875531909 + intValue = -654124145 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("frame") Frame frame; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("aa") - volatile boolean field466; - @ObfuscatedName("ak") + @ObfuscatedName("at") + volatile boolean field493; + @ObfuscatedName("am") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - longValue = -8817424516804380497L + longValue = 496005376701536871L ) - volatile long field470; - @ObfuscatedName("al") + volatile long field497; + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Lao;" + signature = "Lbc;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("am") + @ObfuscatedName("ax") @Export("eventQueue") final EventQueue eventQueue; @@ -206,7 +196,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field467 = 500; + field491 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -216,10 +206,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field466 = true; + this.field493 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field470 = 0L; + this.field497 = 0L; EventQueue var1 = null; try { @@ -228,34 +218,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - UserComparator9.method3462(new DevicePcmPlayerProvider()); + ReflectionCheck.method2397(new DevicePcmPlayerProvider()); } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-184957247" + garbageValue = "133431336" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method947(); + this.method1100(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Ljava/lang/Object;I)V", - garbageValue = "-1941582772" + garbageValue = "2088668403" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - FriendLoginUpdate.method5325(1L); + class169.method3541(1L); } if (var1 != null) { @@ -265,10 +255,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Lfi;", - garbageValue = "-1591236478" + signature = "(I)Lfq;", + garbageValue = "-2143582784" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -280,34 +270,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "75" + garbageValue = "9" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "794890574" + garbageValue = "-639881287" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1563804954" + garbageValue = "-1901343027" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - UserComparator4.method3451(); + Language.method3744(); java.awt.Canvas var1 = this.canvas; var1.setFocusTraversalKeysEnabled(false); var1.addKeyListener(KeyHandler.KeyHandler_instance); @@ -316,29 +306,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1024883115" + signature = "(B)V", + garbageValue = "0" ) @Export("setUpMouse") protected final void setUpMouse() { - java.awt.Canvas var1 = this.canvas; - var1.addMouseListener(MouseHandler.MouseHandler_instance); - var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var1.addFocusListener(MouseHandler.MouseHandler_instance); + GrandExchangeOfferTotalQuantityComparator.method179(this.canvas); } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1230297818" + signature = "(B)V", + garbageValue = "1" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field459); - this.contentHeight = Math.max(var2.highY, this.field464); + this.contentWidth = Math.max(var2.highX, this.field475); + this.contentHeight = Math.max(var2.highY, this.field488); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -347,12 +334,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.contentHeight = 1; } - Username.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - WorldMapData_1.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - Username.canvasWidth) / 2; + WorldMapLabel.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + Varps.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - WorldMapLabel.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(Username.canvasWidth, WorldMapData_1.canvasHeight); - DevicePcmPlayerProvider.rasterProvider = new RasterProvider(Username.canvasWidth, WorldMapData_1.canvasHeight, this.canvas); + this.canvas.setSize(WorldMapLabel.canvasWidth, Varps.canvasHeight); + class206.rasterProvider = new RasterProvider(WorldMapLabel.canvasWidth, Varps.canvasHeight, this.canvas); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); @@ -360,30 +347,30 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvas.setLocation(this.canvasX, this.canvasY); } - this.field466 = true; + this.field493 = true; this.resizeGame(); } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1781530375" + signature = "(B)V", + garbageValue = "108" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1864888047" + garbageValue = "1120637323" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - Username.canvasWidth - var1; - int var4 = this.contentHeight - WorldMapData_1.canvasHeight - var2; + int var3 = this.contentWidth - WorldMapLabel.canvasWidth - var1; + int var4 = this.contentHeight - Varps.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -418,43 +405,39 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-557275570" + signature = "(B)V", + garbageValue = "-19" ) @Export("replaceCanvas") final void replaceCanvas() { java.awt.Canvas var1 = this.canvas; var1.removeKeyListener(KeyHandler.KeyHandler_instance); var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field387 = -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; + KeyHandler.field429 = -1; + class329.method6078(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } this.addCanvas(); - java.awt.Canvas var3 = this.canvas; - var3.setFocusTraversalKeysEnabled(false); - var3.addKeyListener(KeyHandler.KeyHandler_instance); - var3.addFocusListener(KeyHandler.KeyHandler_instance); - BuddyRankComparator.method3505(this.canvas); + java.awt.Canvas var2 = this.canvas; + var2.setFocusTraversalKeysEnabled(false); + var2.addKeyListener(KeyHandler.KeyHandler_instance); + var2.addFocusListener(KeyHandler.KeyHandler_instance); + GrandExchangeOfferTotalQuantityComparator.method179(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method947(); + this.method1100(); } - @ObfuscatedName("w") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "0" + signature = "(IIII)V", + garbageValue = "-1396193082" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -471,26 +454,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - Username.canvasWidth = var1; - WorldMapData_1.canvasHeight = var2; - GZipDecompressor.RunException_revision = var3; + WorldMapLabel.canvasWidth = var1; + Varps.canvasHeight = var2; + RunException.RunException_revision = var3; RunException.RunException_applet = this; - if (taskHandler == null) { - taskHandler = new TaskHandler(); + if (class227.taskHandler == null) { + class227.taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); + class227.taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - class225.RunException_sendStackTrace((String)null, var5); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("q") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "6" + garbageValue = "2" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -500,47 +483,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - Username.canvasWidth = Math.max(var1.getWidth(), this.field459); - WorldMapData_1.canvasHeight = Math.max(var1.getHeight(), this.field464); + WorldMapLabel.canvasWidth = Math.max(var1.getWidth(), this.field475); + Varps.canvasHeight = Math.max(var1.getHeight(), this.field488); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - Username.canvasWidth -= var2.left + var2.right; - WorldMapData_1.canvasHeight -= var2.top + var2.bottom; + WorldMapLabel.canvasWidth -= var2.left + var2.right; + Varps.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(Username.canvasWidth, WorldMapData_1.canvasHeight); + this.canvas.setSize(WorldMapLabel.canvasWidth, Varps.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, this.canvasY + var2.top); + this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field466 = true; - if (DevicePcmPlayerProvider.rasterProvider != null && Username.canvasWidth == DevicePcmPlayerProvider.rasterProvider.width && WorldMapData_1.canvasHeight == DevicePcmPlayerProvider.rasterProvider.height) { - ((RasterProvider)DevicePcmPlayerProvider.rasterProvider).setComponent(this.canvas); - DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + 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); } else { - DevicePcmPlayerProvider.rasterProvider = new RasterProvider(Username.canvasWidth, WorldMapData_1.canvasHeight, this.canvas); + class206.rasterProvider = new RasterProvider(WorldMapLabel.canvasWidth, Varps.canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field470 = WorldMapIcon_0.currentTimeMillis(); + this.field497 = class217.currentTimeMillis(); } - @ObfuscatedName("z") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1249538229" + garbageValue = "-2067681931" ) @Export("checkHost") protected final boolean checkHost() { @@ -569,52 +552,52 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "34" + signature = "(I)V", + garbageValue = "633792840" ) @Export("clientTick") void clientTick() { - long var1 = WorldMapIcon_0.currentTimeMillis(); - long var3 = clientTickTimes[class14.clientTickTimeIdx]; - clientTickTimes[class14.clientTickTimeIdx] = var1; - class14.clientTickTimeIdx = class14.clientTickTimeIdx + 1 & 31; - if (var3 != 0L && var1 > var3) { + long var1 = class217.currentTimeMillis(); + long var3 = clientTickTimes[ClientPreferences.clientTickTimeIdx]; + clientTickTimes[ClientPreferences.clientTickTimeIdx] = var1; + ClientPreferences.clientTickTimeIdx = ClientPreferences.clientTickTimeIdx + 1 & 31; + if (0L != var3 && var1 > var3) { } synchronized(this) { - GrandExchangeOfferTotalQuantityComparator.hasFocus = volatileFocus; + hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "44654688" + garbageValue = "-1772330803" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = WorldMapIcon_0.currentTimeMillis(); - long var4 = graphicsTickTimes[graphicsTickTimeIdx]; - graphicsTickTimes[graphicsTickTimeIdx] = var2; - graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; - if (var4 != 0L && var2 > var4) { + long var2 = class217.currentTimeMillis(); + long var4 = graphicsTickTimes[class60.graphicsTickTimeIdx]; + graphicsTickTimes[class60.graphicsTickTimeIdx] = var2; + class60.graphicsTickTimeIdx = class60.graphicsTickTimeIdx + 1 & 31; + if (0L != var4 && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field467 - 1 > 50) { - field467 -= 50; - this.field466 = true; - this.canvas.setSize(Username.canvasWidth, WorldMapData_1.canvasHeight); + if (++field491 - 1 > 50) { + field491 -= 50; + this.field493 = true; + this.canvas.setSize(WorldMapLabel.canvasWidth, Varps.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); + this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -624,42 +607,42 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method938(); - this.draw(this.field466); - if (this.field466) { + this.method1033(); + this.draw(this.field493); + if (this.field493) { this.clearBackground(); } - this.field466 = false; + this.field493 = false; } - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "847743243" + garbageValue = "317204031" ) - final void method938() { + final void method1033() { Bounds var1 = this.getFrameContentBounds(); - if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { + if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-92" + garbageValue = "-102" ) - final void method947() { + final void method1100() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("aa") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-46" + signature = "(I)V", + garbageValue = "1478721255" ) @Export("kill") final synchronized void kill() { @@ -683,98 +666,98 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (taskHandler != null) { + if (class227.taskHandler != null) { try { - taskHandler.close(); + class227.taskHandler.close(); } catch (Exception var2) { } } - this.vmethod1478(); + this.vmethod1400(); } } - @ObfuscatedName("as") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "159835862" + garbageValue = "-678556074" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ak") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1684911639" + signature = "(B)V", + garbageValue = "-113" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1486807503" + signature = "(ZB)V", + garbageValue = "1" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("aw") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2144356516" + signature = "(S)V", + garbageValue = "8226" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ar") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(ILjava/lang/String;ZI)V", - garbageValue = "-1421329320" + garbageValue = "-1925389891" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (fontHelvetica13 == null) { - fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - class42.loginScreenFontMetrics = this.canvas.getFontMetrics(fontHelvetica13); + if (LoginScreenAnimation.fontHelvetica13 == null) { + LoginScreenAnimation.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + Ignored.loginScreenFontMetrics = this.canvas.getFontMetrics(LoginScreenAnimation.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight); + var4.fillRect(0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (WorldMapRegion.field254 == null) { - WorldMapRegion.field254 = this.canvas.createImage(304, 34); + if (WorldMapArea.field265 == null) { + WorldMapArea.field265 = this.canvas.createImage(304, 34); } - Graphics var6 = WorldMapRegion.field254.getGraphics(); + Graphics var6 = WorldMapArea.field265.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(fontHelvetica13); + var6.setFont(LoginScreenAnimation.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - class42.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(WorldMapRegion.field254, Username.canvasWidth / 2 - 152, WorldMapData_1.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - Ignored.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(WorldMapArea.field265, WorldMapLabel.canvasWidth / 2 - 152, Varps.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = Username.canvasWidth / 2 - 152; - int var8 = WorldMapData_1.canvasHeight / 2 - 18; + int var7 = WorldMapLabel.canvasWidth / 2 - 152; + int var8 = Varps.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(fontHelvetica13); + var4.setFont(LoginScreenAnimation.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class42.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - Ignored.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -782,21 +765,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("av") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-36" + signature = "(I)V", + garbageValue = "-104499552" ) - protected final void method952() { - WorldMapRegion.field254 = null; - fontHelvetica13 = null; - class42.loginScreenFontMetrics = null; + protected final void method1025() { + WorldMapArea.field265 = null; + LoginScreenAnimation.fontHelvetica13 = null; + Ignored.loginScreenFontMetrics = null; } - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-33" + signature = "(Ljava/lang/String;I)V", + garbageValue = "2133222215" ) @Export("error") protected void error(String var1) { @@ -812,58 +795,58 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ad") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(I)Ljava/awt/Container;", - garbageValue = "103754322" + garbageValue = "-875370329" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("am") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(I)Lll;", - garbageValue = "1892805538" + signature = "(B)Lld;", + garbageValue = "-26" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field459); - int var3 = Math.max(var1.getHeight(), this.field464); + int var2 = Math.max(var1.getWidth(), this.field475); + int var3 = Math.max(var1.getHeight(), this.field488); if (this.frame != null) { Insets var4 = this.frame.getInsets(); - var2 -= var4.right + var4.left; - var3 -= var4.bottom + var4.top; + var2 -= var4.left + var4.right; + var3 -= var4.top + var4.bottom; } return new Bounds(var2, var3); } - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "101" + signature = "(I)Z", + garbageValue = "-584501921" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("an") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-2" + signature = "(I)V", + garbageValue = "-277226112" ) - protected abstract void vmethod1478(); + protected abstract void vmethod1400(); public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field466 = true; - if (WorldMapIcon_0.currentTimeMillis() - this.field470 > 1000L) { + this.field493 = true; + if (class217.currentTimeMillis() - this.field497 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= Username.canvasWidth && var2.height >= WorldMapData_1.canvasHeight) { + if (var2 == null || var2.width >= WorldMapLabel.canvasWidth && var2.height >= Varps.canvasHeight) { this.isCanvasInvalid = true; } } @@ -873,56 +856,18 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void destroy() { if (this == gameShell && !isKilled) { - stopTimeMs = WorldMapIcon_0.currentTimeMillis(); - FriendLoginUpdate.method5325(5000L); + stopTimeMs = class217.currentTimeMillis(); + class169.method3541(5000L); this.kill(); } } - public final void start() { - if (this == gameShell && !isKilled) { - stopTimeMs = 0L; - } - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field466 = true; - } - - public final void windowClosed(WindowEvent var1) { - } - - public final void windowDeactivated(WindowEvent var1) { - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public final void windowIconified(WindowEvent var1) { - } - - public final void windowOpened(WindowEvent var1) { - } - - public final void stop() { - if (this == gameShell && !isKilled) { - stopTimeMs = WorldMapIcon_0.currentTimeMillis() + 4000L; - } - } - - public abstract void init(); - - public final void update(Graphics var1) { - this.paint(var1); - } - public void run() { try { if (TaskHandler.javaVendor != null) { String var1 = TaskHandler.javaVendor.toLowerCase(); if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = class216.javaVersion; + String var2 = TaskHandler.javaVersion; if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { this.error("wrongjava"); return; @@ -930,11 +875,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class14.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && PcmPlayer.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (class248.isNumber(var4) && VerticalAlignment.parseInt(var4) < 10) { + if (MusicPatch.isNumber(var4) && Tiles.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -947,12 +892,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - clock = Client.method1432(); + clock = class74.method1326(); - while (stopTimeMs == 0L || WorldMapIcon_0.currentTimeMillis() < stopTimeMs) { - Fonts.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); + while (0L == stopTimeMs || class217.currentTimeMillis() < stopTimeMs) { + ModelData0.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < Fonts.gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < ModelData0.gameCyclesToDo; ++var5) { this.clientTick(); } @@ -960,159 +905,69 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.post(this.canvas); } } catch (Exception var6) { - class225.RunException_sendStackTrace((String)null, var6); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var6); this.error("crash"); } this.kill(); } - public final void windowClosing(WindowEvent var1) { - this.destroy(); + public final void start() { + if (this == gameShell && !isKilled) { + stopTimeMs = 0L; + } } - public final void windowActivated(WindowEvent var1) { + public final void stop() { + if (this == gameShell && !isKilled) { + stopTimeMs = class217.currentTimeMillis() + 4000L; + } + } + + public final void update(Graphics var1) { + this.paint(var1); } public final void focusLost(FocusEvent var1) { volatileFocus = false; } - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;II)Lgr;", - garbageValue = "-1004911552" - ) - static MusicPatch method1067(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); + public abstract void init(); + + public final void windowOpened(WindowEvent var1) { } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-32048125" - ) - @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 + TextureProvider.charToByteCp1252(var0.charAt(var3)); - } - - return var2; + public final void windowActivated(WindowEvent var1) { } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "1623349797" - ) - @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; + public final void windowDeactivated(WindowEvent var1) { } - @ObfuscatedName("ff") + public final void windowClosed(WindowEvent var1) { + } + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.field493 = true; + } + + public final void windowClosing(WindowEvent var1) { + this.destroy(); + } + + public final void windowDeiconified(WindowEvent var1) { + } + + public final void windowIconified(WindowEvent var1) { + } + + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "856923102" + signature = "(I)V", + garbageValue = "-1927353059" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - Tiles.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - Tiles.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - Tiles.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1193 = 1; - } else if (var0 == 4) { - Login.loginIndex = 12; - Login.field1165 = 0; - } else if (var0 == 5) { - Login.field1193 = 2; - Tiles.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) { - Tiles.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - Tiles.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - Tiles.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - Tiles.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - Tiles.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - Tiles.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - Tiles.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - Tiles.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - Tiles.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - Tiles.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - Tiles.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - Login.loginIndex = 12; - Login.field1165 = 1; - } else if (var0 == 19) { - Tiles.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - Tiles.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - Tiles.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - Tiles.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - Tiles.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - Tiles.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - Tiles.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - Tiles.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - Tiles.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) { - Tiles.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) { - Tiles.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - Tiles.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) { - Tiles.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - Projectile.updateGameState(11); - return; - } - - if (var0 == 57) { - Tiles.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - Projectile.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - Tiles.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - - Projectile.updateGameState(10); + public static final void method1155() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 27a1ffe422..cfef3ff570 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,65 +1,56 @@ -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("l") +@ObfuscatedName("i") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("j") + @ObfuscatedName("sx") + @ObfuscatedSignature( + signature = "Lg;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1568217923 + intValue = -1236605669 ) - static int field45; - @ObfuscatedName("n") + static int field75; + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lhe;" + signature = "[Lle;" ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("dj") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("c") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1956147033 + intValue = 658095085 ) @Export("world") public final int world; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 7213176078958271683L + longValue = 2297014437459523259L ) @Export("age") public final long age; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lm;" + signature = "Lb;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("offerName") String offerName; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lkp;BI)V" + signature = "(Lkb;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -69,8 +60,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method120(2); - this.grandExchangeOffer.method112(var2); + this.grandExchangeOffer.method211(2); + this.grandExchangeOffer.method187(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -78,145 +69,562 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1646612919" + garbageValue = "1636604960" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-81405509" + signature = "(B)Ljava/lang/String;", + garbageValue = "-119" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("i") - public static int method96(long var0) { - return (int)(var0 >>> 0 & 127L); + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([Lgo;II)Lgo;", + garbageValue = "-1609956543" + ) + @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("aw") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "193251724" + signature = "(IIIIIIB)I", + garbageValue = "30" ) - static int method97(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); + 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("at") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "550527389" + signature = "(Ljava/lang/String;I)V", + garbageValue = "62688093" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (SecureRandomFuture.garbageCollector == null || !SecureRandomFuture.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + static final void method165(String var0) { + Skeleton.addGameMessage(30, "", var0); + } - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - SecureRandomFuture.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; + @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; + } + + boolean var7 = true; + var8 = new Buffer(var2); + var9 = -1; + + label645: + while (true) { + var10 = var8.method5589(); + if (var10 == 0) { + var0 &= var7; + break; + } + + var9 += var10; + var11 = 0; + boolean var12 = false; + + while (true) { + while (!var12) { + var13 = var8.readUShortSmart(); + if (var13 == 0) { + continue label645; + } + + 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; + } + } + } + + var13 = var8.readUShortSmart(); + if (var13 == 0) { + break; + } + + var8.readUnsignedByte(); + } } } - } catch (Throwable var11) { } - } - if (SecureRandomFuture.garbageCollector != null) { - long var9 = WorldMapIcon_0.currentTimeMillis(); - long var3 = SecureRandomFuture.garbageCollector.getCollectionTime(); - if (-1L != GameShell.garbageCollectorLastCollectionTime) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(var5 * 100L / var7); + 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; + + while (true) { + var10 = var8.method5589(); + if (var10 == 0) { + break; + } + + var9 += var10; + var11 = 0; + + 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; + + 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; + } + + CollisionMap var34 = null; + if (var33 >= 0) { + var34 = var39[var33]; + } + + PacketBuffer.method5554(var35, var31, var32, var20, var29 + var50 & 3, var28, var45, var34); + } + } + } + } + } + } + } + } + } + } + } + + 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; + class51.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; } - - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; } - - return var0; } - @ObfuscatedName("gy") + @ObfuscatedName("kn") @ObfuscatedSignature( - signature = "(Lbx;I)V", - garbageValue = "2089906351" + signature = "(Ljava/lang/String;I)V", + garbageValue = "209958068" ) - static final void method88(Actor var0) { - if (var0.field986 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GraphicsDefaults.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field986 - var0.field985; - int var2 = Client.cycle - var0.field985; - int var3 = var0.field981 * 128 + var0.field942 * 2013925376; - int var4 = var0.field957 * 128 + var0.field942 * 2013925376; - int var5 = var0.field961 * 128 + var0.field942 * 2013925376; - int var6 = var0.field991 * 128 + var0.field942 * 2013925376; - var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; - } - - var0.field997 = 0; - var0.orientation = var0.field987; - var0.rotation = var0.orientation; - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "(Lhn;I)V", - garbageValue = "948929027" - ) - static final void method93(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field910 == -1) { - Client.field910 = var0.spriteId2; - Client.field911 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field910; - } else { - var0.spriteId2 = Client.field911; - } - - } else if (var1 == 325) { - if (Client.field910 == -1) { - Client.field910 = var0.spriteId2; - Client.field911 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field911; - } else { - var0.spriteId2 = Client.field910; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; + @Export("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); } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 913a6287b8..161c83a046 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -1,34 +1,39 @@ -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.ArrayList; import java.util.Collections; 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("d") +@ObfuscatedName("g") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("t") + @ObfuscatedName("nl") + @ObfuscatedSignature( + signature = "[Lhe;" + ) + static Widget[] field70; + @ObfuscatedName("m") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("c") + @ObfuscatedName("er") + @ObfuscatedGetter( + intValue = 745968807 + ) + static int field71; + @ObfuscatedName("x") @Export("events") public final List events; @@ -41,7 +46,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkp;Z)V", + signature = "(Lkb;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -63,10 +68,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;ZI)V", - garbageValue = "-221925974" + garbageValue = "-1613593832" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -78,611 +83,97 @@ public class GrandExchangeEvents { } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lbf;I)V", - garbageValue = "-711075472" + signature = "(II)Lef;", + garbageValue = "1600674213" ) - @Export("doCycleTitle") - static void doCycleTitle(GameShell var0) { - if (Login.worldSelectOpen) { - class208.method4019(var0); + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - WorldMapSection2.clientPreferences.titleMusicDisabled = !WorldMapSection2.clientPreferences.titleMusicDisabled; - WorldMapData_1.savePreferences(); - if (!WorldMapSection2.clientPreferences.titleMusicDisabled) { - class162.method3523(MouseHandler.archive6, "scape main", "", 255, false); + AbstractArchive var3 = GZipDecompressor.SequenceDefinition_animationsArchive; + AbstractArchive var4 = class92.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 { - class197.midiPcmStream.clear(); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; + byte[] var10 = var4.getFile(var9, 0); + if (var10 == null) { + var5 = false; + } } } - if (Client.gameState != 5) { - if (-1L == Login.field1180) { - Login.field1180 = WorldMapIcon_0.currentTimeMillis() + 1000L; - } - - long var1 = WorldMapIcon_0.currentTimeMillis(); - if (AbstractRasterProvider.method6151() && Login.field1194 == -1L) { - Login.field1194 = var1; - if (Login.field1194 > Login.field1180) { - Login.field1180 = Login.field1194; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - int var3; - if (Language.Language_EN == FriendLoginUpdate.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var3 = Login.xPadding + 5; - short var4 = 463; - byte var5 = 100; - byte var6 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var5 + var3 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { - World.method1762(); - return; - } - } - - if (World.World_request != null) { - World.method1762(); - } - } - - var3 = MouseHandler.MouseHandler_lastButton; - int var20 = MouseHandler.MouseHandler_lastPressedX; - int var21 = MouseHandler.MouseHandler_lastPressedY; - if (var3 == 0) { - var20 = MouseHandler.MouseHandler_x; - var21 = MouseHandler.MouseHandler_y; - } - - if (!ArchiveLoader.mouseCam && var3 == 4) { - var3 = 1; - } - - short var24; - int var25; - if (Login.loginIndex == 0) { - boolean var26 = false; - - while (SoundSystem.isKeyDown()) { - if (RouteStrategy.field2102 == 84) { - var26 = true; - } - } - - var25 = class96.loginBoxCenter - 80; - var24 = 291; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { - class215.openURL(class42.method809("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var25 = class96.loginBoxCenter + 80; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20 || var26) { - 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; - class81.method2099(); - } 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; - class81.method2099(); - } 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; - class81.method2099(); - } else { - ViewportMouse.Login_promptCredentials(false); - } - } - } else { - short var7; - int var22; - if (Login.loginIndex == 1) { - while (true) { - if (!SoundSystem.isKeyDown()) { - var22 = class96.loginBoxCenter - 80; - var7 = 321; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(false); - } - - var22 = class96.loginBoxCenter + 80; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (RouteStrategy.field2102 == 84) { - ViewportMouse.Login_promptCredentials(false); - } else if (RouteStrategy.field2102 == 13) { - Login.loginIndex = 0; - } - } - } else { - short var23; - if (Login.loginIndex == 2) { - var23 = 201; - var22 = var23 + 52; - if (var3 == 1 && var21 >= var22 - 12 && var21 < var22 + 2) { - Login.currentLoginField = 0; - } - - var22 += 15; - if (var3 == 1 && var21 >= var22 - 12 && var21 < var22 + 2) { - Login.currentLoginField = 1; - } - - var22 += 15; - var23 = 361; - if (Login.field1175 != null) { - var25 = Login.field1175.highX / 2; - if (var3 == 1 && var20 >= Login.field1175.lowX - var25 && var20 <= var25 + Login.field1175.lowX && var21 >= var23 - 15 && var21 < var23) { - switch(Login.field1193) { - case 1: - Tiles.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: - class215.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var25 = class96.loginBoxCenter - 80; - var24 = 321; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Tiles.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Tiles.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Tiles.setLoginResponseString("", "Connecting to server...", ""); - UserComparator3.method3497(false); - Projectile.updateGameState(20); - return; - } - - var25 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - Frames.field1885 = 0; - LoginScreenAnimation.otp = ""; - Login.field1185 = true; - } - - var25 = class96.loginBoxCenter + -117; - var24 = 277; - Login.field1183 = var20 >= var25 && var20 < var25 + class216.field2559 && var21 >= var24 && var21 < var24 + AbstractWorldMapData.field190; - if (var3 == 1 && Login.field1183) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && WorldMapSection2.clientPreferences.rememberedUsername != null) { - WorldMapSection2.clientPreferences.rememberedUsername = null; - WorldMapData_1.savePreferences(); - } - } - - var25 = class96.loginBoxCenter + 24; - var24 = 277; - Login.field1184 = var20 >= var25 && var20 < var25 + class216.field2559 && var21 >= var24 && var21 < var24 + AbstractWorldMapData.field190; - if (var3 == 1 && Login.field1184) { - WorldMapSection2.clientPreferences.hideUsername = !WorldMapSection2.clientPreferences.hideUsername; - if (!WorldMapSection2.clientPreferences.hideUsername) { - Login.Login_username = ""; - WorldMapSection2.clientPreferences.rememberedUsername = null; - class81.method2099(); - } - - WorldMapData_1.savePreferences(); - } - - while (true) { - Transferable var10; - int var11; - do { - while (true) { - label870: - do { - while (true) { - while (SoundSystem.isKeyDown()) { - if (RouteStrategy.field2102 != 13) { - if (Login.currentLoginField != 0) { - continue label870; - } - - DirectByteArrayCopier.method4004(class51.field432); - if (RouteStrategy.field2102 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (RouteStrategy.field2102 == 84 || RouteStrategy.field2102 == 80) { - Login.currentLoginField = 1; - } - - if (class238.method4414(class51.field432) && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class51.field432; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - Frames.field1885 = 0; - LoginScreenAnimation.otp = ""; - Login.field1185 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (RouteStrategy.field2102 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (RouteStrategy.field2102 == 84 || RouteStrategy.field2102 == 80) { - Login.currentLoginField = 0; - if (RouteStrategy.field2102 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Tiles.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - Tiles.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - Tiles.setLoginResponseString("", "Connecting to server...", ""); - UserComparator3.method3497(false); - Projectile.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && RouteStrategy.field2102 == 67) { - Clipboard var9 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var10 = var9.getContents(Username.client); - var11 = 20 - Login.Login_password.length(); - break; - } - - if (BuddyRankComparator.method3510(class51.field432) && class238.method4414(class51.field432) && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + class51.field432; - } - } - } while(var11 <= 0); - - try { - String var12 = (String)var10.getTransferData(DataFlavor.stringFlavor); - int var13 = Math.min(var11, var12.length()); - - for (int var14 = 0; var14 < var13; ++var14) { - if (!BuddyRankComparator.method3510(var12.charAt(var14)) || !class238.method4414(var12.charAt(var14))) { - Login.loginIndex = 3; - return; - } - } - - Login.Login_password = Login.Login_password + var12.substring(0, var13); - } catch (UnsupportedFlavorException var18) { - } catch (IOException var19) { - } - } - } else if (Login.loginIndex == 3) { - var22 = Login.loginBoxX + 180; - var7 = 276; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(false); - } - - var22 = Login.loginBoxX + 180; - var7 = 326; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - Tiles.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 var15; - if (Login.loginIndex == 4) { - var22 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - LoginScreenAnimation.otp.trim(); - if (LoginScreenAnimation.otp.length() != 6) { - Tiles.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - Frames.field1885 = Integer.parseInt(LoginScreenAnimation.otp); - LoginScreenAnimation.otp = ""; - UserComparator3.method3497(true); - Tiles.setLoginResponseString("", "Connecting to server...", ""); - Projectile.updateGameState(20); - return; - } - - if (var3 == 1 && var20 >= Login.loginBoxX + 180 - 9 && var20 <= Login.loginBoxX + 180 + 130 && var21 >= 263 && var21 <= 296) { - Login.field1185 = !Login.field1185; - } - - if (var3 == 1 && var20 >= Login.loginBoxX + 180 - 34 && var20 <= Login.loginBoxX + 34 + 180 && var21 >= 351 && var21 <= 363) { - class215.openURL(class42.method809("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var22 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - Frames.field1885 = 0; - LoginScreenAnimation.otp = ""; - } - - while (SoundSystem.isKeyDown()) { - boolean var8 = false; - - for (var15 = 0; var15 < "1234567890".length(); ++var15) { - if (class51.field432 == "1234567890".charAt(var15)) { - var8 = true; - break; - } - } - - if (RouteStrategy.field2102 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - Frames.field1885 = 0; - LoginScreenAnimation.otp = ""; - } else { - if (RouteStrategy.field2102 == 85 && LoginScreenAnimation.otp.length() > 0) { - LoginScreenAnimation.otp = LoginScreenAnimation.otp.substring(0, LoginScreenAnimation.otp.length() - 1); - } - - if (RouteStrategy.field2102 == 84) { - LoginScreenAnimation.otp.trim(); - if (LoginScreenAnimation.otp.length() != 6) { - Tiles.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - Frames.field1885 = Integer.parseInt(LoginScreenAnimation.otp); - LoginScreenAnimation.otp = ""; - UserComparator3.method3497(true); - Tiles.setLoginResponseString("", "Connecting to server...", ""); - Projectile.updateGameState(20); - return; - } - - if (var8 && LoginScreenAnimation.otp.length() < 6) { - LoginScreenAnimation.otp = LoginScreenAnimation.otp + class51.field432; - } - } - } - } else if (Login.loginIndex == 5) { - var22 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - WorldMapSection2.method344(); - return; - } - - var22 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(true); - } - - var24 = 361; - if (WorldMapCacheName.field315 != null) { - var15 = WorldMapCacheName.field315.highX / 2; - if (var3 == 1 && var20 >= WorldMapCacheName.field315.lowX - var15 && var20 <= var15 + WorldMapCacheName.field315.lowX && var21 >= var24 - 15 && var21 < var24) { - class215.openURL(class42.method809("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (SoundSystem.isKeyDown()) { - boolean var27 = false; - - for (int var16 = 0; var16 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var16) { - if (class51.field432 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var16)) { - var27 = true; - break; - } - } - - if (RouteStrategy.field2102 == 13) { - ViewportMouse.Login_promptCredentials(true); - } else { - if (RouteStrategy.field2102 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (RouteStrategy.field2102 == 84) { - WorldMapSection2.method344(); - return; - } - - if (var27 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class51.field432; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var22 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - class215.openURL(class42.method809("secure", true) + "m=dob/set_dob.ws", true, false); - Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var22 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var22 = Login.loginBoxX + 180 - 80; - var7 = 321; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - class215.openURL("https://www.jagex.com/terms/privacy", true, false); - Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var22 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var17 = ""; - switch(Login.field1165) { - case 0: - var17 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var17 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - ViewportMouse.Login_promptCredentials(false); - } - - var25 = Login.loginBoxX + 180; - var24 = 276; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { - class215.openURL(var17, true, false); - Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var25 = Login.loginBoxX + 180; - var24 = 326; - if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { - ViewportMouse.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var22 = Login.loginBoxX + 180; - var7 = 301; - if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { - ViewportMouse.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!SoundSystem.isKeyDown()) { - var23 = 321; - if (var3 == 1 && var21 >= var23 - 20 && var21 <= var23 + 20) { - ViewportMouse.Login_promptCredentials(true); - } - - return; - } - } while(RouteStrategy.field2102 != 84 && RouteStrategy.field2102 != 13); - - ViewportMouse.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("m") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(Lbg;I)V", - garbageValue = "-1842266265" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - WorldMapLabelSize.method197(var0.isMembersOnly()); - } - - NetSocket.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - WorldMapLabelSize.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - Client.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - WorldMapSection2.port3 = WorldMapLabelSize.port1; - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - signature = "(Lhn;Lif;IIZI)V", - garbageValue = "-1029339816" - ) - @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; + Frames var2; + if (!var5) { + var2 = null; } else { - var6 = 37; + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; + } } - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; - } + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } - if (var6 != -1 && var7 != null) { - class160.insertMenuItem(var7, PacketWriter.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + return var2; } + } + @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 4074907bb2..487b52c362 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -3,52 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") +@ObfuscatedName("b") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("du") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lia;" + signature = "Liy;" ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("hd") - @ObfuscatedGetter( - intValue = -1999981463 + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("dk") + @ObfuscatedSignature( + signature = "Lih;" ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("c") + @Export("archive2") + static Archive archive2; + @ObfuscatedName("x") @Export("state") byte state; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1202522813 + intValue = -1191314621 ) @Export("id") public int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -286950223 + intValue = -1373983325 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -191142567 + intValue = -435168387 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1418175861 + intValue = 1383495981 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 45465727 + intValue = 1519014469 ) @Export("currentPrice") public int currentPrice; @@ -57,7 +58,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkp;Z)V", + signature = "(Lkb;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -69,42 +70,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-51" + signature = "(I)I", + garbageValue = "1689314705" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-96" + signature = "(I)I", + garbageValue = "-1922096625" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-38" + signature = "(II)V", + garbageValue = "587802237" ) - void method120(int var1) { + void method211(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-59985742" + garbageValue = "-582599399" ) - void method112(int var1) { + void method187(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -112,65 +113,196 @@ public class GrandExchangeOffer { } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-27" + signature = "([Ljava/lang/String;[SIII)V", + garbageValue = "922781737" ) - public static int method128(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; - } + @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; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1764789679" - ) - public static boolean method129() { - try { - if (class197.field2414 == 2) { - if (FileSystem.musicTrack == null) { - FileSystem.musicTrack = MusicTrack.readTrack(UserComparator5.musicTrackArchive, class197.musicTrackGroupId, class83.musicTrackFileId); - if (FileSystem.musicTrack == null) { - return false; - } - } - - if (class197.soundCache == null) { - class197.soundCache = new SoundCache(UserComparator10.soundEffectsArchive, class197.musicSamplesArchive); - } - - if (class197.midiPcmStream.loadMusicTrack(FileSystem.musicTrack, class197.musicPatchesArchive, class197.soundCache, 22050)) { - class197.midiPcmStream.clearAll(); - class197.midiPcmStream.setPcmStreamVolume(AttackOption.musicTrackVolume); - class197.midiPcmStream.setMusicTrack(FileSystem.musicTrack, KeyHandler.musicTrackBoolean); - class197.field2414 = 0; - FileSystem.musicTrack = null; - class197.soundCache = null; - UserComparator5.musicTrackArchive = null; - return true; + 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; } } - } catch (Exception var1) { - var1.printStackTrace(); - class197.midiPcmStream.clear(); - class197.field2414 = 0; - FileSystem.musicTrack = null; - class197.soundCache = null; - UserComparator5.musicTrackArchive = null; + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } - return false; } - @ObfuscatedName("kn") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1055020085" + signature = "(ILce;ZB)I", + garbageValue = "19" ) - static void method127(int var0) { - Client.oculusOrbState = var0; + 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; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + signature = "(ZLkj;B)V", + garbageValue = "18" + ) + @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.readySequence = var4.definition.readySequence; + 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); + } + } + + } + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-21" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(class7.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var1); + } + + Client.isSpellSelected = false; + ItemContainer.invalidateWidget(var0); + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 598cc5ad7d..ea12b5a1cc 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,23 +1,39 @@ +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; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("v") +@ObfuscatedName("o") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("sg") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lml;" ) - @Export("EnumDefinition_archive") - public static AbstractArchive EnumDefinition_archive; + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("e") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("ee") + @ObfuscatedGetter( + intValue = 1640375913 + ) + @Export("port2") + static int port2; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ll;Ll;I)I", - garbageValue = "1533624032" + signature = "(Li;Li;I)I", + garbageValue = "-720251669" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -32,557 +48,1176 @@ final class GrandExchangeOfferAgeComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-370455307" + signature = "(Lbr;I)V", + garbageValue = "1934352071" ) - public static void method162() { - class96.reflectionChecks = new IterableNodeDeque(); + @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("ja") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([Lhn;IIIIIIII)V", - garbageValue = "-442172669" + signature = "(Lej;[Lfm;I)V", + garbageValue = "-1662285695" ) - @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 || WorldMapIcon_0.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (VarcInt.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && VarcInt.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; + 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 (var19 < var11) { - var17 = var19; - var19 = var11; + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); } - - ++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.field827 = true; - Client.field864 = var10; - Client.field829 = var11; + 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 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; } + } - boolean var32 = false; - if (var9.field2646) { - switch(Client.field808) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field664 == var9.id >>> 16) { - var32 = true; + 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]++; } - break; - case 3: - if (var9.id == Client.field664) { - var32 = true; + } + + 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 (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 (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; - if (SequenceDefinition.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class96.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) { - WorldMapSection0.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class267.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - WorldMapIcon_0.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + 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]; } - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - WorldMapIcon_0.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - ViewportMouse.method3060(var9, var17 - var10, var18 - var11); - } + 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]; } - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2702.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2702[var20] != null) { - for (var23 = 0; var23 < var9.field2702[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2711 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2702[var20][var23]]; - } - - if (MusicPatchNode.method3902(var9.field2702[var20][var23]) || var24) { - var21 = true; - if (var9.field2711 != null && var9.field2711[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2648[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) { - NPC.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - WorldMapManager.Widget_runOnTargetLeave(); - MusicPatchNode.selectSpell(var9.id, var9.childIndex, class83.method2108(WorldMapIcon_0.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = PcmPlayer.method2542(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + PacketWriter.colorStartTag(16777215); - } - - var23 = var9.field2649[var20]; - if (var9.field2711 == null) { - var9.field2711 = new int[var9.field2702.length]; - } - - if (var9.field2560 == null) { - var9.field2560 = new int[var9.field2702.length]; - } - - if (var23 != 0) { - if (var9.field2711[var20] == 0) { - var9.field2711[var20] = var23 + Client.cycle + var9.field2560[var20]; - } else { - var9.field2711[var20] = var23 + Client.cycle; - } - } else { - var9.field2711[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2711 != null) { - var9.field2711[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; + 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; } - boolean var34 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } + 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; + } - 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) { - Strings.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - WorldMapIcon_0.worldMap.method6363(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && GrandExchangeOfferWorldComparator.method76(WorldMapIcon_0.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field824 = true; - Client.field919 = var10; - Client.field826 = 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); + var31 = DevicePcmPlayerProvider.hslToRgb(var32, var33, var34); } - if (Client.clickedWidget != null || class185.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } + if (var2 > 0) { + boolean var47 = true; + if (var20 == 0 && Tiles.field539[var2][var11][var17] != 0) { + var47 = 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 (var21 > 0 && !UserComparator9.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { + var47 = false; + } + + if (var47 && var22 == var23 && var24 == var22 && var22 == var25) { + var10000 = class51.field404[var2][var11]; + var10000[var17] |= 2340; } } - 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); + var32 = 0; + if (var31 != -1) { + var32 = Rasterizer3D.Rasterizer3D_colorPalette[Strings.method4220(var31, 96)]; } - 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.field847.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.field847.addFirst(var27); - } - } - - if (var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onTimer; - Client.field846.addFirst(var27); - } - - ScriptEvent var28; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field833 > var9.field2706) { - if (var9.varTransmitTriggers != null && Client.field833 - var9.field2706 <= 32) { - label849: - for (var35 = var9.field2706; var35 < Client.field833; ++var35) { - var23 = Client.field832[var35 & 31]; - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var28); - break label849; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2706 = Client.field833; - } - - if (var9.onInvTransmit != null && Client.field835 > var9.field2570) { - if (var9.invTransmitTriggers != null && Client.field835 - var9.field2570 <= 32) { - label825: - for (var35 = var9.field2570; var35 < Client.field835; ++var35) { - var23 = Client.changedItemContainers[var35 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var28); - break label825; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2570 = Client.field835; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2708) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2708 <= 32) { - label801: - for (var35 = var9.field2708; var35 < Client.changedSkillsCount; ++var35) { - var23 = Client.changedSkills[var35 & 31]; - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - var28 = new ScriptEvent(); - var28.widget = var9; - var28.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var28); - break label801; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2708 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2705 && var9.onChatTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field839 > var9.field2705 && var9.onFriendTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field823 > var9.field2705 && var9.onClanTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field841 > var9.field2705 && var9.onStockTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field842 > var9.field2705 && var9.field2674 != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.field2674; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field795 > var9.field2705 && var9.onMiscTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2705 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field762; ++var35) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.keyTyped = Client.field869[var35]; - var29.keyPressed = Client.field868[var35]; - var29.args = var9.onKey; - Client.scriptEvents.addFirst(var29); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || class185.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) { - GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + 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 { - GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var9; + 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); } } + } + } + } + } - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - VarbitDefinition.field3296 = var9; + 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; + } + + 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); + } + } + } + + 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 ((class51.field404[var6][var8][var7] & var2) != 0) { + var9 = var7; + var10 = var7; + var11 = var6; + + for (var12 = var6; var9 > 0 && (class51.field404[var6][var8][var9 - 1] & var2) != 0; --var9) { } - if (var9.scrollHeight > var9.height) { - VarcInt.method4485(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + while (var10 < 104 && (class51.field404[var6][var8][var10 + 1] & var2) != 0) { + ++var10; + } + + label465: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class51.field404[var11 - 1][var8][var13] & var2) == 0) { + break label465; + } + } + + --var11; + } + + label454: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class51.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 = class51.field404[var17][var8]; + var10000[var18] &= ~var2; + } + } } } - 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); + if ((class51.field404[var6][var8][var7] & var3) != 0) { + var9 = var8; + var10 = var8; + var11 = var6; + + for (var12 = var6; var9 > 0 && (class51.field404[var6][var9 - 1][var7] & var3) != 0; --var9) { } - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var30 != null) { - if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var31.isMouseInputEvent) { - var31.remove(); - var31.widget.containsMouse = false; - } - } + while (var10 < 104 && (class51.field404[var6][var10 + 1][var7] & var3) != 0) { + ++var10; + } - if (SequenceDefinition.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - class96.addCancelMenuEntry(); + label518: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class51.field404[var11 - 1][var13][var7] & var3) == 0) { + break label518; } } - WorldMapDecoration.updateRootInterface(var30.group, var12, var13, var14, var15, var10, var11); + --var11; + } + + label507: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((class51.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 = class51.field404[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((class51.field404[var6][var8][var7] & var4) != 0) { + var9 = var8; + var10 = var8; + var11 = var7; + + for (var12 = var7; var11 > 0 && (class51.field404[var6][var8][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (class51.field404[var6][var8][var12 + 1] & var4) != 0) { + ++var12; + } + + label571: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((class51.field404[var6][var9 - 1][var13] & var4) == 0) { + break label571; + } + } + + --var9; + } + + label560: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((class51.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 = class51.field404[var6][var14]; + var10000[var15] &= ~var4; + } + } } } } @@ -592,18 +1227,60 @@ final class GrandExchangeOfferAgeComparator implements Comparator { } - @ObfuscatedName("kc") + @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1093482480" + signature = "(I)V", + garbageValue = "-2010586363" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + 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 723d26fa44..604574490a 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -3,21 +3,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("r") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("dg") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lhe;" ) - @Export("archive9") - static Archive archive9; - - @ObfuscatedName("c") + static Widget field115; + @ObfuscatedName("ea") @ObfuscatedSignature( - signature = "(Ll;Ll;B)I", - garbageValue = "48" + signature = "Lih;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "Lla;" + ) + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Li;Li;I)I", + garbageValue = "-1993640176" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -32,476 +44,537 @@ final class GrandExchangeOfferNameComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lem;[Lfv;I)V", - garbageValue = "1041712074" + signature = "(Lkj;ILbi;II)V", + garbageValue = "160137381" ) - static final void method152(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; + 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; - 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 ((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 (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } + if (var2.spotAnimation == 65535) { + var2.spotAnimation = -1; } } - Tiles.field512 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field512 < -8) { - Tiles.field512 = -8; + int var6; + if ((var3 & 128) != 0) { + var5 = var0.method5564(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.method5604(); + GrandExchangeOfferWorldComparator.performPlayerAnimation(var2, var5, var6); } - if (Tiles.field512 > 8) { - Tiles.field512 = 8; + 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); } - Tiles.field519 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field519 < -16) { - Tiles.field519 = -16; + 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 (Tiles.field519 > 16) { - Tiles.field519 = 16; + 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 var10; - int var11; int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var42 = InterfaceParent.field565[var2]; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; - var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); - Tiles.field509[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - class268.Tiles_hue[var11] = 0; - HorizontalAlignment.Tiles_saturation[var11] = 0; - class30.Tiles_lightness[var11] = 0; - class40.Tiles_hueMultiplier[var11] = 0; - TileItemPile.field1529[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.field502[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var43 = GraphicsObject.method2055(var14 - 1); - var10000 = class268.Tiles_hue; - var10000[var12] += var43.hue; - var10000 = HorizontalAlignment.Tiles_saturation; - var10000[var12] += var43.saturation; - var10000 = class30.Tiles_lightness; - var10000[var12] += var43.lightness; - var10000 = class40.Tiles_hueMultiplier; - var10000[var12] += var43.hueMultiplier; - var10002 = TileItemPile.field1529[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = Tiles.field502[var2][var14][var12] & 255; - if (var15 > 0) { - FloorUnderlayDefinition var44 = GraphicsObject.method2055(var15 - 1); - var10000 = class268.Tiles_hue; - var10000[var12] -= var44.hue; - var10000 = HorizontalAlignment.Tiles_saturation; - var10000[var12] -= var44.saturation; - var10000 = class30.Tiles_lightness; - var10000[var12] -= var44.lightness; - var10000 = class40.Tiles_hueMultiplier; - var10000[var12] -= var44.hueMultiplier; - var10002 = TileItemPile.field1529[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 (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 += class268.Tiles_hue[var18]; - var13 += HorizontalAlignment.Tiles_saturation[var18]; - var14 += class30.Tiles_lightness[var18]; - var15 += class40.Tiles_hueMultiplier[var18]; - var16 += TileItemPile.field1529[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= class268.Tiles_hue[var19]; - var13 -= HorizontalAlignment.Tiles_saturation[var19]; - var14 -= class30.Tiles_lightness[var19]; - var15 -= class40.Tiles_hueMultiplier[var19]; - var16 -= TileItemPile.field1529[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.field502[var2][var11][var17] & 255; - int var21 = Tiles.field514[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.field509[var11][var17]; - int var27 = Tiles.field509[var11 + 1][var17]; - int var28 = Tiles.field509[var11 + 1][var17 + 1]; - int var29 = Tiles.field509[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 = class192.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field512 & 255; - var34 += Tiles.field519; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = class192.hslToRgb(var32, var33, var34); - } - - if (var2 > 0) { - boolean var47 = true; - if (var20 == 0 && Tiles.field507[var2][var11][var17] != 0) { - var47 = false; - } - - if (var21 > 0 && !ArchiveLoader.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { - var47 = false; - } - - if (var47 && var23 == var22 && var22 == var24 && var25 == var22) { - var10000 = UrlRequest.field1940[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[DynamicObject.method2286(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = Tiles.field507[var2][var11][var17] + 1; - byte var48 = Tiles.field518[var2][var11][var17]; - FloorOverlayDefinition var35 = ArchiveLoader.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 = class192.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var39 = var35.hue + Tiles.field512 & 255; - var40 = var35.lightness + Tiles.field519; - if (var40 < 0) { - var40 = 0; - } else if (var40 > 255) { - var40 = 255; - } - - var38 = class192.hslToRgb(var39, var35.saturation, var40); - } - - var39 = 0; - if (var38 != -2) { - var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { - var40 = var35.secondaryHue + Tiles.field512 & 255; - int var41 = var35.secondaryLightness + Tiles.field519; - if (var41 < 0) { - var41 = 0; - } else if (var41 > 255) { - var41 = 255; - } - - var38 = class192.hslToRgb(var40, var35.secondarySaturation, var41); - var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), WorldMapRegion.method564(var37, var26), WorldMapRegion.method564(var37, var27), WorldMapRegion.method564(var37, var28), WorldMapRegion.method564(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; + 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 { - var17 = var2; + var12 = var14 ? 90 : 2; } - var0.setTileMinPlane(var2, var12, var11, var17); + if (var18.modIcon != -1) { + Skeleton.addGameMessage(var12, class1.method21(var18.modIcon) + var2.username.getName(), var11); + } else { + Skeleton.addGameMessage(var12, var2.username.getName(), var11); + } } } - Tiles.field502[var2] = null; - Tiles.field514[var2] = null; - Tiles.field507[var2] = null; - Tiles.field518[var2] = null; - InterfaceParent.field565[var2] = null; + var0.offset = var9 + var8; } - var0.method3186(-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 ((var3 & 256) != 0) { + for (var5 = 0; var5 < 3; ++var5) { + var2.actions[var5] = var0.readStringCp1252NullTerminated(); } } - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { + if ((var3 & 16) != 0) { + var5 = var0.readUnsignedByte(); + int var15; + int var17; + int var19; if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; + 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); + } } - for (int var6 = 0; var6 <= var5; ++var6) { - for (int var7 = 0; var7 <= 104; ++var7) { - for (int var8 = 0; var8 <= 104; ++var8) { - short var46; - if ((UrlRequest.field1940[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (UrlRequest.field1940[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label444: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UrlRequest.field1940[var11 - 1][var8][var13] & var2) == 0) { - break label444; - } - } - - --var11; - } - - label433: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UrlRequest.field1940[var12 + 1][var8][var13] & var2) == 0) { - break label433; - } - } - - ++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 = UrlRequest.field1940[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((UrlRequest.field1940[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (UrlRequest.field1940[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label497: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UrlRequest.field1940[var11 - 1][var13][var7] & var3) == 0) { - break label497; - } - } - - --var11; - } - - label486: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((UrlRequest.field1940[var12 + 1][var13][var7] & var3) == 0) { - break label486; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - 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 = UrlRequest.field1940[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((UrlRequest.field1940[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (UrlRequest.field1940[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (UrlRequest.field1940[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label550: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((UrlRequest.field1940[var6][var9 - 1][var13] & var4) == 0) { - break label550; - } - } - - --var9; - } - - label539: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((UrlRequest.field1940[var6][var10 + 1][var13] & var4) == 0) { - break label539; - } - } - - ++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 = UrlRequest.field1940[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } + 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); + } + } + } - @ObfuscatedName("je") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1818346399" + signature = "(ILce;ZB)I", + garbageValue = "75" ) - static final void method150(int var0) { - if (ScriptFrame.loadInterface(var0)) { - WorldMapEvent.drawModelComponents(WorldMapLabel.Widget_interfaceComponents[var0], -1); + 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; + } + } + } + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "(IIZI)V", + garbageValue = "-1462729636" + ) + 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(); + } + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 78d7ef4b5c..6ac244bdc9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,38 +1,37 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bl") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("qo") - @ObfuscatedGetter( - intValue = -1780442240 + @ObfuscatedName("sb") + @ObfuscatedSignature( + signature = "Lcq;" ) - static int field640; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -153755923 + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lle;" ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("c") + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("n") + public static boolean field677; + @ObfuscatedName("x") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ll;Ll;I)I", - garbageValue = "231872829" + signature = "(Li;Li;B)I", + garbageValue = "-63" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -53,195 +52,70 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "295022584" - ) - public static File method1311(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - JagexCache.JagexCache_locationFile = new File(UserComparator4.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - Buffer var8; - int var11; - File var27; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); - if (var9 == -1) { - throw new IOException(); - } - } - - var8.offset = 0; - var9 = var8.readUnsignedByte(); - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); - } - - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); - if (var10 == 1) { - var5 = var8.readCESU8(); - } - } - - var7.close(); - } catch (IOException var25) { - var25.printStackTrace(); - } - - if (var4 != null) { - var27 = new File(var4); - if (!var27.exists()) { - var4 = null; - } - } - - if (var4 != null) { - var27 = new File(var4, "test.dat"); - - boolean var28; - try { - RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); - var11 = var15.read(); - var15.seek(0L); - var15.write(var11); - var15.seek(0L); - var15.close(); - var27.delete(); - var28 = true; - } catch (Exception var23) { - var28 = false; - } - - if (!var28) { - var4 = null; - } - } - } - - if (var4 == null && var2 == 0) { - label159: - for (int var16 = 0; var16 < class42.field373.length; ++var16) { - for (int var17 = 0; var17 < ChatChannel.field1291.length; ++var17) { - File var18 = new File(ChatChannel.field1291[var17] + class42.field373[var16] + File.separatorChar + var0 + File.separatorChar); - if (var18.exists()) { - File var19 = new File(var18, "test.dat"); - - boolean var29; - try { - RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); - int var13 = var12.read(); - var12.seek(0L); - var12.write(var13); - var12.seek(0L); - var12.close(); - var19.delete(); - var29 = true; - } catch (Exception var22) { - var29 = false; - } - - if (var29) { - var4 = var18.toString(); - var6 = true; - break label159; - } - } - } - } - } - - if (var4 == null) { - var4 = UserComparator4.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var6 = true; - } - - File var26; - if (var5 != null) { - var26 = new File(var5); - var27 = new File(var4); - - try { - File[] var33 = var26.listFiles(); - File[] var31 = var33; - - for (var11 = 0; var11 < var31.length; ++var11) { - File var30 = var31[var11]; - File var20 = new File(var27, var30.getName()); - boolean var14 = var30.renameTo(var20); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var24) { - var24.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - var26 = new File(var4); - var8 = null; - - try { - AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - Buffer var32 = new Buffer(500); - var32.writeByte(3); - var32.writeByte(var8 != null ? 1 : 0); - var32.writeCESU8(var26.getPath()); - if (var8 != null) { - var32.writeCESU8(""); - } - - var34.write(var32.array, 0, var32.offset); - var34.close(); - } catch (IOException var21) { - var21.printStackTrace(); - } - } - - return new File(var4); + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "110" + signature = "(Lbb;I)V", + garbageValue = "295215952" ) - static void method1308() { - Players.Players_count = 0; + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + PlayerAppearance.runScript(var0, 500000); + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1235[var0] = null; - Players.field1237[var0] = 1; + @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; + } + + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "120" + ) + static final String method1385(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + } + } + + @ObfuscatedName("ff") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-90506590" + ) + 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; } + 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 f93f5157b1..e22ee5aae9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,20 +1,27 @@ +import java.awt.Component; +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("j") +@ObfuscatedName("a") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("at") - @Export("hasFocus") - protected static boolean hasFocus; + @ObfuscatedName("gy") + @ObfuscatedGetter( + intValue = -591154231 + ) + static int field91; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ll;Ll;B)I", - garbageValue = "14" + signature = "(Li;Li;B)I", + garbageValue = "-105" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -29,200 +36,150 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;Ljava/lang/String;I)I", - garbageValue = "1410846723" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-1200132301" ) - public static int method104(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = ServerPacket.method3680(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; + static void method179(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "-265400137" + signature = "(Lkb;IS)V", + garbageValue = "-19565" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } + @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][][]; - @ObfuscatedName("jw") - @ObfuscatedSignature( - signature = "(Lhn;IB)I", - garbageValue = "1" - ) - static final int method106(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + for (int var3 = 0; var3 < var2.size; ++var3) { try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; + 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]; - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } + 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); + } + } - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = class2.loadClassFromDescriptor(var8[var12]); + } - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = Varps.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!HealthBarDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[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(); } - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (class2.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); } - 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 = class192.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 = Varps.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!HealthBarDefinition.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 = GrandExchangeOfferUnitPriceComparator.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); - } - - if (var6 == 19) { - var7 = Language.baseY * 64 + (class192.localPlayer.y >> 7); - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } + var2.fields[var3] = Reflection.findField(class2.loadClassFromDescriptor(var5), var6); } - } catch (Exception var14) { - return -1; + } 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)); + if (var1 == 0) { + return null; } else { - return -2; + for (int var2 = 0; var2 < var1; ++var2) { + var0 = MusicPatchNode.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; } } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-4522127" - ) - static void method105(int var0, int var1) { - MenuAction var2 = WorldMapRegion.tempMenuAction; - UserComparator10.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); - WorldMapRegion.tempMenuAction = null; - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index e0b929c07d..fdd7f61dac 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,26 +1,21 @@ +import java.io.IOException; 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("p") +@ObfuscatedName("l") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("ar") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("la") - @ObfuscatedSignature( - signature = "Lhn;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @ObfuscatedName("s") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ll;Ll;B)I", - garbageValue = "0" + signature = "(Li;Li;B)I", + garbageValue = "-48" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -35,139 +30,145 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-2056490791" + signature = "(II)Ljv;", + garbageValue = "-600154853" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var1; - if (var2 != null) { - var1 = var2; + public static HitSplatDefinition method213(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - byte[] var7 = class287.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitDefinition(); - if (var7 != null) { - var2.decode(new Buffer(var7)); + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; } - - 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("ez") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lly;", - garbageValue = "-710096744" + signature = "(Llt;ZB)V", + garbageValue = "1" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return WorldMapIcon_0.worldMap; - } + public static void method222(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var8) { + } - @ObfuscatedName("gt") - @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "2147483647" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; + NetCache.NetCache_socket = null; } - if (var3 < 1) { - var3 = 1; - } - - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field908; - } else if (var5 >= 100) { - var6 = Client.field897; - } else { - var6 = (Client.field897 - Client.field908) * var5 / 100 + Client.field908; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field819) { - var10 = Client.field819; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field673) { - var6 = Client.field673; - 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); + 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) { } - var0 += var9; - var2 -= var9 * 2; + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } - } else if (var7 > Client.field903) { - var10 = Client.field903; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field900) { - var6 = Client.field900; - 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); + } + + 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; } - - var1 += var9; - var3 -= var9 * 2; } - } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - CollisionMap.method3650(var2, var3); + NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; } - @ObfuscatedName("gf") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1156773916" + signature = "(III)Lhe;", + garbageValue = "166208311" ) - static void method141() { - if (class192.localPlayer.x >> 7 == Client.destinationX && class192.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; + @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("ir") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-1682009725" + signature = "(II)Z", + garbageValue = "-1968739504" ) - static final void method135(int var0, int var1, int var2, boolean var3) { - if (ScriptFrame.loadInterface(var0)) { - FloorUnderlayDefinition.resizeInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3); + 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 ad0a4fcb74..76004fbab5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,418 +1,167 @@ 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("g") +@ObfuscatedName("h") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("df") - @ObfuscatedSignature( - signature = "Lia;" + @ObfuscatedName("rb") + @ObfuscatedGetter( + intValue = 587221949 ) - @Export("archive2") - static Archive archive2; - - @ObfuscatedName("c") + static int field64; + @ObfuscatedName("gq") @ObfuscatedSignature( - signature = "(Ll;Ll;I)I", - garbageValue = "250420083" + signature = "Lej;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("hk") + @ObfuscatedGetter( + intValue = -1477050145 + ) + @Export("cameraY") + static int cameraY; + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Li;Li;I)I", + garbageValue = "590840268" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "362180230" - ) - public static boolean method76(int var0) { - return (var0 >> 20 & 1) != 0; + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("m") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lhn;IIII)V", - garbageValue = "1571239297" + signature = "(ILce;ZI)I", + garbageValue = "1020131485" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2649 == null) { - throw new RuntimeException(); + 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; } else { - var0.field2649[var1] = var2; - var0.field2560[var1] = var3; + return 2; } } - @ObfuscatedName("hn") + @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "(Lgy;I)V", - garbageValue = "356089511" + signature = "(I)I", + garbageValue = "-965659136" ) - static final void method77(class185 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (class185.field2314 == var0) { - var2 = var1.method5771(); - var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531; - var4 = (var2 & 7) + FontName.field3663; - var5 = var1.method5606(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field743[var6]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); + 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; } + return var0 * 10000 / Client.field898; } else { - int var9; - int var10; - if (class185.field2327 == var0) { - var2 = var1.method5740(); - var3 = var1.method5606(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531; - var6 = (var4 & 7) + FontName.field3663; - var7 = var1.readUnsignedByte(); - var8 = var7 >> 4 & 15; - var9 = var7 & 7; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var10 = var8 + 1; - if (class192.localPlayer.pathX[0] >= var5 - var10 && class192.localPlayer.pathX[0] <= var5 + var10 && class192.localPlayer.pathY[0] >= var6 - var10 && class192.localPlayer.pathY[0] <= var6 + var10 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var2; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); - ++Client.soundEffectCount; - } - } - } - - TileItem var32; - if (class185.field2322 == var0) { - var2 = var1.method5762(); - var3 = var1.method5605(); - var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; - var5 = (var3 & 7) + FontName.field3663; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - NodeDeque var31 = Client.groundItems[Clock.Client_plane][var4][var5]; - if (var31 != null) { - for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { - if ((var2 & 32767) == var32.id) { - var32.remove(); - break; - } - } - - if (var31.last() == null) { - Client.groundItems[Clock.Client_plane][var4][var5] = null; - } - - WorldMapEvent.updateItemPile(var4, var5); - } - } - - } else if (class185.field2317 == var0) { - var2 = var1.method5614(); - var3 = var1.method5605(); - var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; - var5 = (var3 & 7) + FontName.field3663; - var6 = var1.method5614(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var32 = new TileItem(); - var32.id = var2; - var32.quantity = var6; - if (Client.groundItems[Clock.Client_plane][var4][var5] == null) { - Client.groundItems[Clock.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[Clock.Client_plane][var4][var5].addFirst(var32); - WorldMapEvent.updateItemPile(var4, var5); - } - - } else { - int var11; - if (class185.field2316 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method5605(); - var4 = var3 >> 2; - var5 = var3 & 3; - var6 = Client.field743[var4]; - var7 = var1.method5606(); - var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531; - var9 = (var7 & 7) + FontName.field3663; - if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { - if (var6 == 0) { - BoundaryObject var33 = ServerBuild.scene.method3177(Clock.Client_plane, var8, var9); - if (var33 != null) { - var11 = GrandExchangeEvents.Entity_unpackID(var33.tag); - if (var4 == 2) { - var33.entity1 = new DynamicObject(var11, 2, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var33.entity1); - var33.entity2 = new DynamicObject(var11, 2, var5 + 1 & 3, Clock.Client_plane, var8, var9, var2, false, var33.entity2); - } else { - var33.entity1 = new DynamicObject(var11, var4, var5, Clock.Client_plane, var8, var9, var2, false, var33.entity1); - } - } - } - - if (var6 == 1) { - WallDecoration var42 = ServerBuild.scene.method3178(Clock.Client_plane, var8, var9); - if (var42 != null) { - var11 = GrandExchangeEvents.Entity_unpackID(var42.tag); - if (var4 != 4 && var4 != 5) { - if (var4 == 6) { - var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); - } else if (var4 == 7) { - var42.entity1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); - } else if (var4 == 8) { - var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); - var42.entity2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity2); - } - } else { - var42.entity1 = new DynamicObject(var11, 4, var5, Clock.Client_plane, var8, var9, var2, false, var42.entity1); - } - } - } - - if (var6 == 2) { - GameObject var43 = ServerBuild.scene.method3203(Clock.Client_plane, var8, var9); - if (var4 == 11) { - var4 = 10; - } - - if (var43 != null) { - var43.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var43.tag), var4, var5, Clock.Client_plane, var8, var9, var2, false, var43.entity); - } - } - - if (var6 == 3) { - FloorDecoration var44 = ServerBuild.scene.getFloorDecoration(Clock.Client_plane, var8, var9); - if (var44 != null) { - var44.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var44.tag), 22, var5, Clock.Client_plane, var8, var9, var2, false, var44.entity); - } - } - } - - } else if (class185.field2323 == var0) { - var2 = var1.method5605(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field743[var3]; - var6 = var1.method5762(); - var7 = var1.readUnsignedByte(); - var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531; - var9 = (var7 & 7) + FontName.field3663; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { - Skills.updatePendingSpawn(Clock.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); - } - - } else { - int var12; - int var13; - int var14; - if (class185.field2320 == var0) { - var2 = var1.method5605(); - var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531; - var4 = (var2 & 7) + FontName.field3663; - byte var37 = var1.readByte(); - var6 = var1.method5740(); - byte var38 = var1.method5618(); - byte var39 = var1.method5780(); - var9 = var1.method5605(); - var10 = var9 >> 2; - var11 = var9 & 3; - var12 = Client.field743[var10]; - var13 = var1.method5762(); - var14 = var1.method5614(); - byte var15 = var1.method5618(); - int var16 = var1.method5740(); - Player var17; - if (var14 == Client.localPlayerIndex) { - var17 = class192.localPlayer; - } else { - var17 = Client.players[var14]; - } - - if (var17 != null) { - ObjectDefinition var18 = Occluder.getObjectDefinition(var16); - int var19; - int var20; - if (var11 != 1 && var11 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var3 + (var19 >> 1); - int var22 = var3 + (var19 + 1 >> 1); - int var23 = var4 + (var20 >> 1); - int var24 = var4 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[Clock.Client_plane]; - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; - int var27 = (var3 << 7) + (var19 << 6); - int var28 = (var4 << 7) + (var20 << 6); - Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); - if (var29 != null) { - Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var12, -1, 0, 0, var6 + 1, var13 + 1); - var17.animationCycleStart = var6 + Client.cycle; - var17.animationCycleEnd = var13 + Client.cycle; - var17.model0 = var29; - var17.field622 = var3 * 128 + var19 * 64; - var17.field620 = var4 * 128 + var20 * 64; - var17.tileHeight2 = var26; - byte var30; - if (var37 > var39) { - var30 = var37; - var37 = var39; - var39 = var30; - } - - if (var38 > var15) { - var30 = var38; - var38 = var15; - var15 = var30; - } - - var17.field626 = var37 + var3; - var17.field628 = var39 + var3; - var17.field627 = var4 + var38; - var17.field629 = var4 + var15; - } - } - } - - if (class185.field2318 == var0) { - var2 = var1.readShort(); - var3 = var1.readUnsignedByte(); - var4 = var1.method5771(); - var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531; - var6 = (var4 & 7) + FontName.field3663; - var7 = var1.method5771() * 4; - var8 = var1.method5762(); - var9 = var1.method5771() * 4; - var10 = var1.readUnsignedShort(); - var11 = var1.method5606(); - byte var40 = var1.method5609(); - byte var41 = var1.method5618(); - var14 = var1.readUnsignedShort(); - var13 = var41 + var5; - var12 = var40 + var6; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var13 >= 0 && var12 >= 0 && var13 < 104 && var12 < 104 && var14 != 65535) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - var13 = var13 * 128 + 64; - var12 = var12 * 128 + 64; - Projectile var34 = new Projectile(var14, Clock.Client_plane, var5, var6, WorldMapSectionType.getTileHeight(var5, var6, Clock.Client_plane) - var7, var10 + Client.cycle, var8 + Client.cycle, var11, var3, var2, var9); - var34.setDestination(var13, var12, WorldMapSectionType.getTileHeight(var13, var12, Clock.Client_plane) - var9, var10 + Client.cycle); - Client.projectiles.addFirst(var34); - } - - } else if (class185.field2315 != var0) { - if (class185.field2319 == var0) { - var2 = var1.method5762(); - var3 = var1.method5771(); - var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; - var5 = (var3 & 7) + FontName.field3663; - var6 = var1.readUnsignedByte(); - var7 = var1.method5614(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var4 = var4 * 128 + 64; - var5 = var5 * 128 + 64; - GraphicsObject var45 = new GraphicsObject(var7, Clock.Client_plane, var4, var5, WorldMapSectionType.getTileHeight(var4, var5, Clock.Client_plane) - var6, var2, Client.cycle); - Client.graphicsObjects.addFirst(var45); - } - - } - } else { - var2 = var1.method5740(); - var3 = var1.method5762(); - var4 = var1.method5614(); - var5 = var1.method5771(); - var6 = (var5 >> 4 & 7) + SecureRandomCallable.field531; - var7 = (var5 & 7) + FontName.field3663; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var35 = Client.groundItems[Clock.Client_plane][var6][var7]; - if (var35 != null) { - for (TileItem var36 = (TileItem)var35.last(); var36 != null; var36 = (TileItem)var35.previous()) { - if ((var2 & 32767) == var36.id && var4 == var36.quantity) { - var36.quantity = var3; - break; - } - } - - WorldMapEvent.updateItemPile(var6, var7); - } - } - - } - } - } + return 10000; } } - @ObfuscatedName("iv") + @ObfuscatedName("gu") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "-87" + signature = "(Lbi;IIB)V", + garbageValue = "8" ) - static final void method74(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; + @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; } - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var6 + var13; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var15 + var7 + var1; - Rasterizer3D.method3066(var17, var18, var19); - Rasterizer3D.method3123(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3066(var17, var19, var20); - Rasterizer3D.method3123(var21, var23, var24, var17, var19, var20, var4); + 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 3e581bc4b7..7039b00ab6 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -1,95 +1,93 @@ -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("lj") +@ObfuscatedName("lx") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2019117197 + intValue = 281653791 ) @Export("compass") public int compass; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1099214959 + intValue = -1495832325 ) - public int field3796; - @ObfuscatedName("o") + public int field3824; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1016295027 + intValue = 465334207 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -153404939 + intValue = 1124129299 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 382264229 + intValue = -392532665 ) - public int field3799; - @ObfuscatedName("g") + public int field3817; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1961256143 + intValue = 505847237 ) - public int field3800; - @ObfuscatedName("d") + public int field3818; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 185996655 + intValue = -322608503 ) - public int field3803; - @ObfuscatedName("l") + public int field3819; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 875223521 + intValue = 91782019 ) - public int field3802; - @ObfuscatedName("j") + public int field3820; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -979917091 + intValue = -918755557 ) - public int field3805; - @ObfuscatedName("m") + public int field3821; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1753253309 + intValue = -1836222511 ) - public int field3804; - @ObfuscatedName("p") + public int field3822; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 519795879 + intValue = -581916301 ) - public int field3795; + public int field3823; public GraphicsDefaults() { this.compass = -1; - this.field3796 = -1; + this.field3824 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3799 = -1; - this.field3800 = -1; - this.field3803 = -1; - this.field3802 = -1; - this.field3805 = -1; - this.field3804 = -1; - this.field3795 = -1; + this.field3817 = -1; + this.field3818 = -1; + this.field3819 = -1; + this.field3820 = -1; + this.field3821 = -1; + this.field3822 = -1; + this.field3823 = -1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;I)V", - garbageValue = "-1404571691" + signature = "(Liy;I)V", + garbageValue = "-1759254165" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3793.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3811.group); Buffer var3 = new Buffer(var2); while (true) { @@ -103,220 +101,38 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5593(); - this.field3796 = var3.method5593(); - this.mapScenes = var3.method5593(); - this.headIconsPk = var3.method5593(); - this.field3799 = var3.method5593(); - this.field3800 = var3.method5593(); - this.field3803 = var3.method5593(); - this.field3802 = var3.method5593(); - this.field3805 = var3.method5593(); - this.field3804 = var3.method5593(); - this.field3795 = var3.method5593(); + 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(); } } } - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IB)Lip;", - garbageValue = "14" - ) - @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("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("ay") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "64" + signature = "(Lkb;Ljava/lang/String;B)I", + garbageValue = "77" ) - static int method5955(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - Message.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + ItemContainer.intToString(var4, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - long var11 = 86400000L * ((long)var10 + 11745L); - 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[++Message.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[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - Message.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.method712(Client.compareStrings(Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1], FriendLoginUpdate.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - class320.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var13 = MouseHandler.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - class320.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var13 = MouseHandler.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - Message.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Skills.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ArchiveDiskAction.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ClanChat.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class14.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - class320.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--Message.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[++Message.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - Message.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - Message.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - if (class192.localPlayer.appearance != null && class192.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } - } - } + 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 c6a555b88a..166d7f37d1 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,74 +1,74 @@ import java.io.IOException; -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 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("br") +@ObfuscatedName("cs") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("c") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1800757053 + intValue = 2069035029 ) - @Export("id") - int id; - @ObfuscatedName("t") + static int field1141; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 815583153 - ) - @Export("cycleStart") - int cycleStart; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 497499711 - ) - @Export("plane") - int plane; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1418605465 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -744262401 + intValue = -1892453991 ) @Export("y") int y; - @ObfuscatedName("g") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1599899605 + intValue = -760249917 + ) + @Export("id") + int id; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1800328217 + ) + @Export("cycleStart") + int cycleStart; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1899634503 + ) + @Export("plane") + int plane; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1416163877 + ) + @Export("x") + int x; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1568421589 ) @Export("height") int height; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lip;" + signature = "Ljc;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 715957131 + intValue = 137908093 ) @Export("frame") int frame; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1558881033 + intValue = 1659950887 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("isFinished") boolean isFinished; @@ -82,20 +82,20 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = class65.SpotAnimationDefinition_get(this.id).sequence; + int var8 = MouseHandler.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var8); + this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "65536" + garbageValue = "-937691597" ) @Export("advance") final void advance(int var1) { @@ -114,14 +114,14 @@ public final class GraphicsObject extends Entity { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class65.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = MouseHandler.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -132,203 +132,68 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)[Lih;", - garbageValue = "-51" + signature = "(B)V", + garbageValue = "-22" ) - static HorizontalAlignment[] method2064() { - return new HorizontalAlignment[]{HorizontalAlignment.field3454, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3451}; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;B)V", - garbageValue = "66" - ) - public static void method2063(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(JLjava/lang/String;I)I", - garbageValue = "-2060202992" - ) - static final int method2060(long var0, String var2) { - Random var3 = new Random(); - Buffer var4 = new Buffer(128); - Buffer var5 = new Buffer(128); - int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; - var4.writeByte(10); - - int var7; - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.writeInt(var6[0]); - var4.writeInt(var6[1]); - var4.writeLong(var0); - var4.writeLong(0L); - - for (var7 = 0; var7 < 4; ++var7) { - var4.writeInt(var3.nextInt()); - } - - var4.encryptRsa(class80.field1123, class80.field1120); - var5.writeByte(10); - - for (var7 = 0; var7 < 3; ++var7) { - var5.writeInt(var3.nextInt()); - } - - var5.writeLong(var3.nextLong()); - var5.writeLongMedium(var3.nextLong()); - if (Client.randomDatData != null) { - var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var8 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var8); - - int var9; - for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) { - } - - if (var9 >= 24) { - throw new IOException(); - } - } catch (Exception var24) { - for (int var10 = 0; var10 < 24; ++var10) { - var8[var10] = -1; - } + public static void method2121() { + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; } - - var5.writeBytes(var8, 0, var8.length); } - var5.writeLong(var3.nextLong()); - var5.encryptRsa(class80.field1123, class80.field1120); - var7 = Buddy.stringCp1252NullTerminatedByteSize(var2); - if (var7 % 8 != 0) { - var7 += 8 - var7 % 8; - } + } - Buffer var25 = new Buffer(var7); - var25.writeStringCp1252NullTerminated(var2); - var25.offset = var7; - var25.xteaEncryptAll(var6); - Buffer var18 = new Buffer(var25.offset + var4.offset + var5.offset + 5); - var18.writeByte(2); - var18.writeByte(var4.offset); - var18.writeBytes(var4.array, 0, var4.offset); - var18.writeByte(var5.offset); - var18.writeBytes(var5.array, 0, var5.offset); - var18.writeShort(var25.offset); - var18.writeBytes(var25.array, 0, var25.offset); - String var20 = Frames.method3340(var18.array); + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)[B", + garbageValue = "1774574647" + ) + public static byte[] method2120() { + byte[] var0 = new byte[24]; try { - URL var11 = new URL(class42.method809("services", false) + "m=accountappeal/login.ws"); - URLConnection var12 = var11.openConnection(); - var12.setDoInput(true); - var12.setDoOutput(true); - var12.setConnectTimeout(5000); - OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); - var13.write("data2=" + ArchiveDiskAction.method4216(var20) + "&dest=" + ArchiveDiskAction.method4216("passwordchoice.ws")); - var13.flush(); - InputStream var14 = var12.getInputStream(); - var18 = new Buffer(new byte[1000]); + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); - do { - int var15 = var14.read(var18.array, var18.offset, 1000 - var18.offset); - if (var15 == -1) { - var13.close(); - var14.close(); - String var21 = new String(var18.array); - if (var21.startsWith("OFFLINE")) { - return 4; - } else if (var21.startsWith("WRONG")) { - return 7; - } else if (var21.startsWith("RELOAD")) { - return 3; - } else if (var21.startsWith("Not permitted for social network accounts.")) { - return 6; - } else { - var18.xteaDecryptAll(var6); - - while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) { - --var18.offset; - } - - var21 = new String(var18.array, 0, var18.offset); - boolean var16; - if (var21 == null) { - var16 = false; - } else { - label107: { - try { - new URL(var21); - } catch (MalformedURLException var22) { - var16 = false; - break label107; - } - - var16 = true; - } - } - - if (var16) { - class215.openURL(var21, true, false); - return 2; - } else { - return 5; - } - } - } - - var18.offset += var15; - } while(var18.offset < 1000); - - return 5; - } catch (Throwable var23) { - var23.printStackTrace(); - return 5; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IB)Lix;", - garbageValue = "52" - ) - public static FloorUnderlayDefinition method2055(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); + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { } - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; + if (var1 >= 24) { + throw new IOException(); + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { + var0[var2] = -1; + } } + + return var0; } - @ObfuscatedName("ic") + @ObfuscatedName("ft") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIS)V", - garbageValue = "3604" + signature = "(ZI)V", + garbageValue = "1004007010" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class160.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + 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 c79732f148..c3f4c7668d 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,42 +1,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cg") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("dt") - @ObfuscatedSignature( - signature = "Lia;" + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = -1163501961 ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("o") + static int field1145; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lid;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljm;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Liy;)V" + signature = "(Lid;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIIS)V", - garbageValue = "6521" + signature = "(IIIIB)V", + garbageValue = "86" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -69,10 +69,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lbh;", - garbageValue = "-1345078848" + signature = "(II)Lcc;", + garbageValue = "1772939720" ) @Export("get") HealthBarUpdate get(int var1) { @@ -83,7 +83,7 @@ public class HealthBar extends Node { var2 = var3; } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; } else { var2.remove(); @@ -94,13 +94,25 @@ public class HealthBar extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-818833492" + garbageValue = "1327552245" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4886(); + return this.updates.method4891(); + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1544257049" + ) + 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); } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 4dba405735..75df72efa6 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,88 +4,82 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("id") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("HitSplatDefinition_spritesArchive") - public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("HealthBarDefinition_cachedSprites") public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1117339079 + intValue = -418379087 ) - public int field3275; - @ObfuscatedName("l") + public int field3276; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1485041687 + intValue = 257214369 ) @Export("int1") public int int1; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1134400629 + intValue = 1626711481 ) @Export("int2") public int int2; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1866957287 + intValue = -519347749 ) @Export("int3") public int int3; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 125223577 + ) + public int field3272; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1867870977 - ) - public int field3283; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1689196735 + intValue = -211627759 ) @Export("int5") public int int5; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -69680089 + intValue = 1469087681 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2086615621 + intValue = -1575037275 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 111327577 + intValue = 411601749 ) @Export("width") public int width; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1970632159 + intValue = 1992936291 ) @Export("widthPadding") public int widthPadding; @@ -95,11 +89,11 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); } - HealthBarDefinition() { + public HealthBarDefinition() { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.field3283 = 1; + this.field3272 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -107,13 +101,13 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-2130379460" + signature = "(Lkb;I)V", + garbageValue = "-1815085637" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -124,10 +118,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-1944435606" + signature = "(Lkb;II)V", + garbageValue = "1931441853" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -144,9 +138,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5593(); + this.frontSpriteID = var1.method5591(); } else if (var2 == 8) { - this.backSpriteID = var1.method5593(); + this.backSpriteID = var1.method5591(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -157,10 +151,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)Llt;", - garbageValue = "87" + signature = "(S)Lla;", + garbageValue = "1701" ) @Export("getFrontSprite") public Sprite getFrontSprite() { @@ -171,7 +165,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -181,10 +175,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Llt;", - garbageValue = "19" + signature = "(I)Lla;", + garbageValue = "1861000233" ) @Export("getBackSprite") public Sprite getBackSprite() { @@ -195,7 +189,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -205,64 +199,20 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IB)Lif;", - garbageValue = "89" + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-906146296" ) - @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 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; - 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 (!class298.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 = PacketBufferNode.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; + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + TaskHandler.charToByteCp1252(var0.charAt(var3)); } + + return var2; } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 34bcabe676..46b1b7531c 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,35 +1,33 @@ -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("bh") +@ObfuscatedName("cc") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2058375931 + intValue = -186864867 ) @Export("cycle") int cycle; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -309904715 + intValue = 134168981 ) @Export("health") int health; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 362852511 + intValue = -1066019297 ) @Export("health2") int health2; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1829739139 + intValue = 442713571 ) @Export("cycleOffset") int cycleOffset; @@ -41,10 +39,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-75" + signature = "(IIIII)V", + garbageValue = "-2054467883" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -54,61 +52,15 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("c") - static boolean method1757(long var0) { - return Tile.method2926(var0) == 2; - } - - @ObfuscatedName("c") - public static String method1758(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; - } - - @ObfuscatedName("as") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-601302979" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "87" ) - static int method1759(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Friend.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - VertexNormal.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --class320.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapSection2.clientPreferences.windowMode = var3; - WorldMapData_1.savePreferences(); - } - - return 1; - } - } + @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 8f47208f62..74f546ca22 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,120 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("jv") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) - public static AbstractArchive field3329; - @ObfuscatedName("o") + @Export("HitSplatDefinition_archive") + public static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("e") + public static AbstractArchive field3322; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("hs") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1943215083 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -36563091 + intValue = -1275511307 ) @Export("fontId") int fontId; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -549916475 + intValue = 1688289147 ) @Export("textColor") public int textColor; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -795329979 - ) - public int field3328; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2007057893 - ) - int field3339; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1439710291 - ) - int field3324; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -378798801 - ) - int field3331; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -403504011 - ) - int field3332; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1748437233 - ) - public int field3323; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1149201175 - ) - public int field3334; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -600429647 - ) - public int field3335; - @ObfuscatedName("b") - String field3322; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -960133159 - ) - public int field3337; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 465425557 - ) - public int field3338; - @ObfuscatedName("a") - @Export("transforms") - public int[] transforms; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1372204811 + intValue = 500240173 + ) + public int field3329; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1934317107 + ) + int field3330; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -26542295 + ) + 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; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -990470317 + ) + public int field3334; + @ObfuscatedName("o") + String field3337; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1652547133 + ) + public int field3327; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -6083753 + ) + public int field3339; + @ObfuscatedName("y") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 752219759 ) @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1090071963 + intValue = -250584565 ) @Export("transformVarp") int transformVarp; @@ -128,31 +122,31 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } - public HitSplatDefinition() { + HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field3328 = 70; - this.field3339 = -1; - this.field3324 = -1; + this.field3329 = 70; + this.field3330 = -1; this.field3331 = -1; this.field3332 = -1; - this.field3323 = 0; - this.field3334 = 0; - this.field3335 = -1; - this.field3322 = ""; - this.field3337 = -1; + this.field3333 = -1; this.field3338 = 0; + this.field3341 = 0; + this.field3334 = -1; + this.field3337 = ""; + this.field3327 = -1; + this.field3339 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "1729846192" + signature = "(Lkb;I)V", + garbageValue = "1621555289" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -163,41 +157,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-1144577894" + signature = "(Lkb;II)V", + garbageValue = "575571509" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5593(); + this.fontId = var1.method5591(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3339 = var1.method5593(); + this.field3330 = var1.method5591(); } else if (var2 == 4) { - this.field3331 = var1.method5593(); + this.field3332 = var1.method5591(); } else if (var2 == 5) { - this.field3324 = var1.method5593(); + this.field3331 = var1.method5591(); } else if (var2 == 6) { - this.field3332 = var1.method5593(); + this.field3333 = var1.method5591(); } else if (var2 == 7) { - this.field3323 = var1.readShort(); - } else if (var2 == 8) { - this.field3322 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { - this.field3328 = var1.readUnsignedShort(); - } else if (var2 == 10) { - this.field3334 = var1.readShort(); - } else if (var2 == 11) { - this.field3335 = 0; - } else if (var2 == 12) { - this.field3337 = var1.readUnsignedByte(); - } else if (var2 == 13) { this.field3338 = var1.readShort(); + } else if (var2 == 8) { + this.field3337 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { + this.field3329 = var1.readUnsignedShort(); + } else if (var2 == 10) { + this.field3341 = var1.readShort(); + } else if (var2 == 11) { + this.field3334 = 0; + } else if (var2 == 12) { + this.field3327 = var1.readUnsignedByte(); + } else if (var2 == 13) { + this.field3339 = var1.readShort(); } else if (var2 == 14) { - this.field3335 = var1.readUnsignedShort(); + this.field3334 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -232,16 +226,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Lil;", - garbageValue = "105" + signature = "(I)Ljv;", + garbageValue = "-951570117" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); + var1 = Projectile.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -253,36 +247,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - if (var2 != -1) { - HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); - HitSplatDefinition var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = class49.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; - } + return var2 != -1 ? GrandExchangeOfferUnitPriceComparator.method213(var2) : null; } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "1185099535" + garbageValue = "-940233797" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3322; + String var2 = this.field3337; while (true) { int var3 = var2.indexOf("%1"); @@ -290,26 +265,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + ItemContainer.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + class280.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Llt;", - garbageValue = "1146038763" + signature = "(I)Lla;", + garbageValue = "1656176054" ) - public Sprite method4649() { - if (this.field3339 < 0) { + public Sprite method4642() { + if (this.field3330 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3339); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3330); if (var1 != null) { return var1; } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3339, 0); + var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3330, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3339); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3330); } return var1; @@ -317,35 +292,12 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Llt;", - garbageValue = "127" + signature = "(I)Lla;", + garbageValue = "-743591767" ) - public Sprite method4650() { - if (this.field3324 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3324); - if (var1 != null) { - return var1; - } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3324, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3324); - } - - return var1; - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(B)Llt;", - garbageValue = "125" - ) - public Sprite method4651() { + public Sprite method4631() { if (this.field3331 < 0) { return null; } else { @@ -353,7 +305,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3331, 0); + var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3331, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331); } @@ -363,12 +315,12 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Llt;", - garbageValue = "-109" + signature = "(I)Lla;", + garbageValue = "-1442192880" ) - public Sprite method4652() { + public Sprite method4632() { if (this.field3332 < 0) { return null; } else { @@ -376,7 +328,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3332, 0); + var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3332, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332); } @@ -386,10 +338,33 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Lko;", - garbageValue = "-643633719" + signature = "(I)Lla;", + garbageValue = "-2137932181" + ) + public Sprite method4633() { + if (this.field3333 < 0) { + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3333); + if (var1 != null) { + return var1; + } else { + var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3333, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3333); + } + + return var1; + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)Lkx;", + garbageValue = "607832420" ) @Export("getFont") public Font getFont() { @@ -400,12 +375,21 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = FaceNormal.method3335(field3329, HitSplatDefinition_fontsArchive, this.fontId, 0); - if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + 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)); } - return var1; + if (var2 != null) { + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } + + return var2; } } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 63744c8e27..e6d396bdfa 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,38 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("je") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lje;" ) - field3454(0, 0), - @ObfuscatedName("t") + field3458(2, 0), + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lje;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(1, 1), - @ObfuscatedName("o") + HorizontalAlignment_centered(0, 1), + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lje;" ) - field3451(2, 2); + field3453(1, 2); - @ObfuscatedName("p") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1955816399 + intValue = -1684971179 + ) + static int field3456; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1294886119 ) @Export("value") public final int value; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -458653859 + intValue = 834302777 ) @Export("id") final int id; @@ -45,177 +47,34 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)[Llt;", - garbageValue = "831261948" + signature = "(IIIB)J", + garbageValue = "3" ) - public static Sprite[] method4783() { - Sprite[] var0 = new Sprite[class326.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class326.SpriteBuffer_spriteCount; ++var1) { - Sprite var2 = var0[var1] = new Sprite(); - var2.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var2.height = class326.SpriteBuffer_spriteHeight; - var2.xOffset = Huffman.SpriteBuffer_xOffsets[var1]; - var2.yOffset = NPC.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class326.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class326.SpriteBuffer_spriteHeights[var1]; - int var3 = var2.subHeight * var2.subWidth; - byte[] var4 = class326.SpriteBuffer_pixels[var1]; - var2.pixels = new int[var3]; - - for (int var5 = 0; var5 < var3; ++var5) { - var2.pixels[var5] = class326.SpriteBuffer_spritePalette[var4[var5] & 255]; - } - } - - DynamicObject.method2292(); - return var0; + static long method4777(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); } - @ObfuscatedName("iu") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liz;IIII)V", - garbageValue = "1310795801" + signature = "([BI)[B", + garbageValue = "-1597872585" ) - @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 = class192.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = PacketWriter.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = PacketWriter.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = PacketWriter.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = PacketWriter.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = PacketWriter.colorStartTag(65280); - } else if (var9 > 6) { - var6 = PacketWriter.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = PacketWriter.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = PacketWriter.colorStartTag(12648192); - } else { - var6 = PacketWriter.colorStartTag(16776960); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((NetSocket.selectedSpellFlags & 2) == 2) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.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; - } - - GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { - short var12 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class192.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; - } - - GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } - } + 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 8ccb6bf41d..49c74ea63a 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,21 +1,21 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hb") @Implements("Huffman") public class Huffman { - @ObfuscatedName("e") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("masks") int[] masks; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("bits") byte[] bits; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("keys") int[] keys; @@ -102,10 +102,10 @@ public class Huffman { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BII[BIS)I", - garbageValue = "4203" + signature = "([BII[BIB)I", + garbageValue = "77" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -153,10 +153,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BI[BIII)I", - garbageValue = "275908175" + signature = "([BI[BIIB)I", + garbageValue = "-45" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -296,4 +296,222 @@ public class Huffman { return var7 + 1 - var2; } } + + @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" + ) + 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(); + } + + 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 d97344bbc1..4a9c86f2b8 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -2,49 +2,56 @@ 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("jf") +@ObfuscatedName("jb") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("o") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lgl;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lmx;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Lmv;)V" + signature = "(Lmx;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)Ljk;", - garbageValue = "30683" + signature = "(I)Ljd;", + garbageValue = "-1332552421" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)[Ljk;", - garbageValue = "19" + signature = "(II)[Ljd;", + garbageValue = "-667029686" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "1147655369" + signature = "(Lkb;II)V", + garbageValue = "1156120193" ) @Export("read") public void read(Buffer var1, int var2) { @@ -87,4 +94,394 @@ 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 b0a3438b20..d421e10a36 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -1,21 +1,19 @@ +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("jp") +@ObfuscatedName("km") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("gg") - @ObfuscatedSignature( - signature = "[Llt;" - ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; - @ObfuscatedName("c") + @ObfuscatedName("ab") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1391988611 + intValue = -1613598915 ) @Export("id") int id; @@ -23,20 +21,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljp;I)I", - garbageValue = "-2090061914" + signature = "(Lkm;I)I", + garbageValue = "105996759" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("az") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljk;I)I", - garbageValue = "-746331144" + signature = "(Ljd;I)I", + garbageValue = "-1956183743" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -47,30 +45,17 @@ public class Ignored extends User { return this.compareTo_ignored((Ignored)var1); } - @ObfuscatedName("ho") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "5" + signature = "(B)V", + garbageValue = "-54" ) - static final void method5213(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { - if (Client.showMouseOverText) { - int var2 = Client.menuOptionsCount - 1; - String var4; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var4 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { - var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; - } else { - var4 = VerticalAlignment.method4426(var2); - } - - if (Client.menuOptionsCount > 2) { - var4 = var4 + PacketWriter.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - class1.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); - } - } + 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 37983eed12..4c1ac52032 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,35 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("li") +@ObfuscatedName("le") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("pixels") public byte[] pixels; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("palette") public int[] palette; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("subWidth") public int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("subHeight") public int subHeight; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("xOffset") public int xOffset; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("yOffset") public int yOffset; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("height") public int height; - @ObfuscatedName("c") + IndexedSprite() { + } + + @ObfuscatedName("x") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -51,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -84,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("i") - public void method6162(int var1, int var2, int var3, int var4) { + @ObfuscatedName("w") + public void method6211(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -192,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("e") + @ObfuscatedName("d") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -246,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("g") + @ObfuscatedName("v") @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 947d1d6d8d..d2f3a08cdb 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("dq") +@ObfuscatedName("dp") @Implements("Instrument") public class Instrument { - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("a") + @ObfuscatedName("y") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("delayTime") int delayTime; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("delayDecay") int delayDecay; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ldf;" + signature = "Ldc;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lds;" + signature = "Lde;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("duration") int duration; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class301.clearIntArray(Instrument_samples, 0, var1); + class310.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)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.method2769(var1, this.filterEnvelope); + this.filter.method2813(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 2fb6123301..8c2146359b 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("mj") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("c") + @ObfuscatedName("t") + static int[] field4034; + @ObfuscatedName("x") @Export("array") int[] array; @@ -32,10 +34,10 @@ public class IntHashTable { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-113" + signature = "(II)I", + garbageValue = "1863702029" ) @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 f0e4e4024a..0392ebec61 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("fc") +@ObfuscatedName("gz") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index e86620f77d..7171fedcee 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -3,208 +3,174 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -import netscape.javascript.JSObject; -@ObfuscatedName("be") +@ObfuscatedName("bm") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("ps") + @ObfuscatedName("pd") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Lko;" ) @Export("clanChat") static ClanChat clanChat; - @ObfuscatedName("l") - static byte[][][] field565; - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("kx") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 311386537 + intValue = -1870800307 ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("c") + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 741333459 + intValue = 1326721365 ) @Export("group") int group; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1361979275 + intValue = 1502247593 ) @Export("type") int type; - @ObfuscatedName("o") - boolean field568; + @ObfuscatedName("k") + boolean field594; InterfaceParent() { - this.field568 = false; + this.field594 = false; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIZIZI)V", - garbageValue = "-753308840" + signature = "(B)[Liz;", + garbageValue = "101" ) - @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 = class96.World_worlds[var6]; - class96.World_worlds[var6] = class96.World_worlds[var1]; - class96.World_worlds[var1] = var8; + @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}; + } - for (int var9 = var0; var9 < var1; ++var9) { - if (class1.method19(class96.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class96.World_worlds[var9]; - class96.World_worlds[var9] = class96.World_worlds[var7]; - class96.World_worlds[var7++] = var10; + @ObfuscatedName("iq") + @ObfuscatedSignature( + signature = "(Lbi;IIII)V", + garbageValue = "713738223" + ) + @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); } } - - class96.World_worlds[var1] = class96.World_worlds[var7]; - class96.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-332647401" - ) - static int method1191(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - signature = "(Lba;III)V", - garbageValue = "1714214597" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = GraphicsDefaults.SequenceDefinition_get(var1).field3516; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field983 = 0; - } - - if (var3 == 2) { - var0.field983 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || GraphicsDefaults.SequenceDefinition_get(var1).field3508 >= GraphicsDefaults.SequenceDefinition_get(var0.sequence).field3508) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field983 = 0; - var0.field998 = var0.pathLength; - } - - } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - signature = "(Lhn;III)V", - garbageValue = "-749720569" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-53" - ) - static void method1192(String var0) { - GameShell.field477 = var0; - - try { - String var1 = Username.client.getParameter(Integer.toString(18)); - String var2 = Username.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - var3 = var3 + "; Expires=" + HealthBarUpdate.method1758(WorldMapIcon_0.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - Client var4 = Username.client; - String var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var4).eval(var5); - } catch (Throwable var6) { } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 4d922b89e5..e7a83e761a 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -4,56 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("cu") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("o") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("j") + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1080849523 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("t") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 918473247 + intValue = 691433523 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1685756683 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lbb;" + signature = "[Lbv;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("x") + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhe;" + ) + static Widget field1130; + @ObfuscatedName("h") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("q") - static boolean field1094; - @ObfuscatedName("z") - static boolean field1095; - @ObfuscatedName("y") + @ObfuscatedName("a") + static boolean field1125; + @ObfuscatedName("b") + static boolean field1126; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1093173165 + intValue = 2091837547 ) - static int field1088; - @ObfuscatedName("s") - static final double field1097; + static int field1127; + @ObfuscatedName("j") + static final double field1128; static { Interpreter_arrayLengths = new int[5]; @@ -64,121 +78,34 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field1094 = false; - field1095 = false; - field1088 = 0; - field1097 = Math.log(2.0D); + field1125 = false; + field1126 = false; + field1127 = 0; + field1128 = Math.log(2.0D); } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([Lbg;II[I[IB)V", - garbageValue = "-20" + signature = "(I)V", + garbageValue = "1189048729" ) - @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; + static void method2112() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } - 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 (var12 != var11) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } - } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + @ObfuscatedName("kj") + @ObfuscatedSignature( + signature = "([BII)V", + garbageValue = "632066186" + ) + static void method2113(byte[] var0, int var1) { + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; } + class310.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 55e4c7292f..40b11ed9de 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("iq") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1229670201 + intValue = -307651921 ) @Export("size") public int size; @@ -34,10 +34,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "1060242106" + signature = "(Lkb;I)V", + garbageValue = "117570412" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +51,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "774565733" + signature = "(Lkb;II)V", + garbageValue = "-72548916" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -63,4 +63,79 @@ public class InvDefinition extends DualNode { } } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "566997565" + ) + 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; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; + + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + GrandExchangeOfferWorldComparator.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + GrandExchangeOfferWorldComparator.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; + 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(); + } + + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 5561bf1aa7..a070069e2d 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("lw") +@ObfuscatedName("lp") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1084674035 + intValue = -1307848851 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("results") int[] results; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("mm") int[] mm; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1881052481 + intValue = 1312590211 ) @Export("aa") int aa; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1182669169 + intValue = 1716852745 ) @Export("bb") int bb; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1353155945 + intValue = 1213332247 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6314(); + this.method6363(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "32137" + signature = "(I)I", + garbageValue = "-1944633806" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-1112251479" ) - public final int method6307() { + public final int method6364() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "16776960" + garbageValue = "-1611356921" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +109,12 @@ public final class IsaacCipher { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1817393668" + garbageValue = "2132925629" ) - final void method6314() { + final void method6363() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -241,4 +241,19 @@ 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 c092e200bd..dde0caa63c 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,32 +1,35 @@ +import java.applet.Applet; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("bl") +@ObfuscatedName("bs") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("h") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lli;" + signature = "Lle;" ) - static IndexedSprite field547; - @ObfuscatedName("be") + static IndexedSprite field572; + @ObfuscatedName("fr") @ObfuscatedSignature( - signature = "[Lli;" + signature = "Lkf;" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("t") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("m") @Export("ids") int[] ids; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("quantities") int[] quantities; @@ -41,64 +44,109 @@ public class ItemContainer extends Node { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IZB)Ljava/lang/String;", - garbageValue = "-71" + signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "17" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? Actor.method1741(var0, 10, var1) : Integer.toString(var0); - } + 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?&=,.%+-_#:/*"; - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1888961685" - ) - @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.field942 * 367011904 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var13.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; } - long var5 = GameShell.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - ServerBuild.scene.drawEntity(Clock.Client_plane, var2.x, var2.y, WorldMapSectionType.getTileHeight(var2.field942 * 2013925376 - 64 + var2.x, var2.field942 * 2013925376 - 64 + var2.y, Clock.Client_plane), var2.field942 * 2013925376 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + 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) { + } + + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } + } 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; + } + + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; + } + + if (var6 != -1 && var7 != null) { + ScriptFrame.insertMenuItem(var7, class297.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); } } - @ObfuscatedName("kp") + @ObfuscatedName("jo") @ObfuscatedSignature( - signature = "(Lhn;I)Lhn;", - garbageValue = "701959243" + signature = "(Lhe;I)V", + garbageValue = "514293783" ) - static Widget method1184(Widget var0) { - int var2 = WorldMapIcon_0.getWidgetClickMask(var0); - int var1 = var2 >> 17 & 7; - int var3 = var1; - if (var1 == 0) { - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { - var0 = Varps.getWidget(var0.parentId); - if (var0 == null) { - return null; - } - } - - return var0; + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field884) { + Client.field679[var0.rootIndex] = true; } + } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index b0f875fae8..b68a2e63a7 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,297 +4,273 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("jx") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1524909813 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("h") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -536446943 + intValue = -32704117 ) @Export("id") public int id; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -406504769 + intValue = 1028533167 ) @Export("model") int model; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2019539597 + intValue = 790198705 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1726268201 + intValue = -512511795 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 93819839 + intValue = 1120938463 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2090410293 + intValue = -2126697049 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 205349077 + intValue = 2124715319 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -178910167 + intValue = 1998077465 ) @Export("offsetY2d") public int offsetY2d; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1045591487 + intValue = -496150603 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 335051861 + intValue = -1128123323 ) @Export("price") public int price; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1996888449 + intValue = 2022658475 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -665766999 + intValue = -198787353 ) @Export("maleModel") int maleModel; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1666037601 + intValue = -1595882143 ) @Export("maleModel1") int maleModel1; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1212173465 + intValue = -1755438589 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1350778211 + intValue = 384600509 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1772230311 + intValue = 1401958483 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1256641587 + intValue = -289691561 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1552928441 + intValue = 270064135 ) @Export("maleModel2") int maleModel2; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2068450997 + intValue = -2092220545 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1141752707 + intValue = -687751073 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -659175095 + intValue = -726951563 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1827024377 + intValue = 515679975 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("ao") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1593898643 + intValue = 54393855 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("countobj") int[] countobj; - @ObfuscatedName("an") + @ObfuscatedName("ay") @Export("countco") int[] countco; - @ObfuscatedName("ag") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1326162955 + intValue = 1943254675 ) @Export("note") public int note; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1734525481 + intValue = 1721963949 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 978982797 + intValue = -1325952823 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 4324563 + intValue = 1293336691 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 232741831 + intValue = -2092594315 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -916763617 + intValue = 701446973 ) @Export("ambient") public int ambient; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1642665557 + intValue = 1489802711 ) @Export("contrast") public int contrast; - @ObfuscatedName("bc") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1763887503 + intValue = -499099671 ) @Export("team") public int team; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bb") + @ObfuscatedName("bk") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1331779555 + intValue = -997556147 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bp") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1529334619 + intValue = -1745550989 ) @Export("notedId") int notedId; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1795625835 + intValue = -355307627 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("by") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -1321250167 + intValue = 1596605635 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -346,19 +322,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1252611790" + garbageValue = "1255281949" ) @Export("post") void post() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "-72" + signature = "(Lkb;I)V", + garbageValue = "-160078979" ) @Export("decode") void decode(Buffer var1) { @@ -372,10 +348,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "24" + signature = "(Lkb;II)V", + garbageValue = "-1270586282" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -494,16 +470,16 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = MouseRecorder.readStringIntParameters(var1, this.params); + this.params = NetCache.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lif;Lif;B)V", - garbageValue = "4" + signature = "(Ljx;Ljx;B)V", + garbageValue = "98" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -524,10 +500,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lif;Lif;B)V", - garbageValue = "14" + signature = "(Ljx;Ljx;I)V", + garbageValue = "2110553543" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -568,10 +544,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lif;Lif;B)V", - garbageValue = "0" + signature = "(Ljx;Ljx;I)V", + garbageValue = "231591867" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -593,10 +569,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IB)Ldg;", - garbageValue = "2" + signature = "(II)Lea;", + garbageValue = "-1152870229" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -611,11 +587,11 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return HealthBarDefinition.ItemDefinition_get(var2).getModelData(1); + return AbstractWorldMapData.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -639,10 +615,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Ldx;", - garbageValue = "1199706901" + signature = "(IB)Lel;", + garbageValue = "-60" ) @Export("getModel") public final Model getModel(int var1) { @@ -656,7 +632,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return HealthBarDefinition.ItemDefinition_get(var2).getModel(1); + return AbstractWorldMapData.ItemDefinition_get(var2).getModel(1); } } @@ -664,7 +640,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -693,10 +669,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IB)Lif;", - garbageValue = "25" + signature = "(II)Ljx;", + garbageValue = "-2117466306" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { @@ -710,17 +686,17 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return HealthBarDefinition.ItemDefinition_get(var2); + return AbstractWorldMapData.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "-1615353166" + garbageValue = "1659080166" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -737,15 +713,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -753,12 +729,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZI)Ldg;", - garbageValue = "-695579037" + signature = "(ZI)Lea;", + garbageValue = "475767309" ) - public final ModelData method4732(boolean var1) { + public final ModelData method4722(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -771,11 +747,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -809,12 +785,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "509539526" + garbageValue = "-846973377" ) - public final boolean method4731(boolean var1) { + public final boolean method4772(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -826,11 +802,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -838,12 +814,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ZI)Ldg;", - garbageValue = "709869485" + signature = "(ZI)Lea;", + garbageValue = "2065185270" ) - public final ModelData method4741(boolean var1) { + public final ModelData method4724(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -854,9 +830,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -878,10 +854,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "16856082" + garbageValue = "1313437382" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -901,26 +877,26 @@ public class ItemDefinition extends DualNode { return var3; } - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-22" + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1527088310" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorDecoration.method2914(this.params, var1, var2); + return class9.method122(this.params, var1, var2); } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "840008410" + garbageValue = "782275365" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 2022658475 * -2124340989 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } @@ -928,19 +904,4 @@ public class ItemDefinition extends DualNode { return -1; } } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-108" - ) - @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; - } - } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index f94d0711ad..44510d1dc5 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("jb") +@ObfuscatedName("jz") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lfa;)V" + signature = "(Lge;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lfa;" + signature = "()Lge;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lfa;" + signature = "()Lge;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lfa;)Lfa;" + signature = "(Lge;)Lge;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lfa;" + signature = "()Lge;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lfa;Lfa;)V" + signature = "(Lge;Lge;)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 c83798d148..a38e57d37c 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -7,27 +7,27 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jg") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljz;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("head") DualNode head; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lge;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljb;)V" + signature = "(Ljz;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -41,12 +41,8 @@ public class IterableDualNodeQueueIterator implements Iterator { } public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.removeDual(); - this.last = null; - } + 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 1b354a91db..8f0d00aec6 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("jj") +@ObfuscatedName("jm") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) - Node field3528; + Node field3530; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lft;)V" + signature = "(Lga;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lft;)V" + signature = "(Lga;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("last") public Node last() { - return this.method4884((Node)null); + return this.method4895((Node)null); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lft;)Lft;" + signature = "(Lga;)Lga;" ) - Node method4884(Node var1) { + Node method4895(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.field3528 = null; + this.field3530 = null; return null; } else { - this.field3528 = var2.previous; + this.field3530 = var2.previous; return var2; } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("previous") public Node previous() { - Node var1 = this.field3528; + Node var1 = this.field3530; if (var1 == this.sentinel) { - this.field3528 = null; + this.field3530 = null; return null; } else { - this.field3528 = var1.previous; + this.field3530 = var1.previous; return var1; } } - @ObfuscatedName("l") - int method4885() { + @ObfuscatedName("z") + int method4927() { 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("j") - public boolean method4886() { + @ObfuscatedName("t") + public boolean method4891() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()[Lft;" + signature = "()[Lga;" ) - Node[] method4887() { - Node[] var1 = new Node[this.method4885()]; + Node[] method4888() { + Node[] var1 = new Node[this.method4927()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,25 +144,41 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lft;)Z" + signature = "(Lga;)Z" ) - boolean method4891(Node var1) { + boolean method4883(Node var1) { this.addFirst(var1); return true; } - public Object[] toArray() { - return this.method4887(); + 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 boolean isEmpty() { - return this.method4886(); + public int size() { + return this.method4927(); + } + + public boolean contains(Object var1) { + throw new RuntimeException(); + } + + public Object[] toArray() { + return this.method4888(); } public Object[] toArray(Object[] var1) { @@ -183,45 +199,29 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - public boolean retainAll(Collection var1) { throw new RuntimeException(); } - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - public void clear() { this.rsClear(); } - public int hashCode() { - return super.hashCode(); + public boolean add(Object var1) { + return this.method4883((Node)var1); } - public int size() { - return this.method4885(); + public boolean isEmpty() { + return this.method4891(); } - public boolean contains(Object var1) { + public boolean addAll(Collection var1) { throw new RuntimeException(); } - public boolean add(Object var1) { - return this.method4891((Node)var1); - } - - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lft;Lft;)V" + signature = "(Lga;Lga;)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 146371d524..cb3f386cf8 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("ju") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljm;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) - Node field3538; - @ObfuscatedName("o") + Node field3539; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljj;)V" + signature = "(Ljm;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljj;)V" + signature = "(Ljm;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,36 +43,32 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("start") void start() { - this.field3538 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3539 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } - public boolean hasNext() { - return this.deque.sentinel != this.field3538; - } - public Object next() { - Node var1 = this.field3538; + Node var1 = this.field3539; if (var1 == this.deque.sentinel) { var1 = null; - this.field3538 = null; + this.field3539 = null; } else { - this.field3538 = var1.previous; + this.field3539 = var1.previous; } this.last = var1; return var1; } + public boolean hasNext() { + return this.deque.sentinel != this.field3539; + } + public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.remove(); - this.last = null; - } + 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 6b9948ea7d..5d25156502 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("lp") +@ObfuscatedName("ln") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("size") int size; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lft;" + signature = "[Lga;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("current") Node current; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(J)Lft;" + signature = "(J)Lga;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lft;J)V" + signature = "(Lga;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("o") + @ObfuscatedName("k") @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("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index f65ef3d2b8..fbba1f265c 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("lu") +@ObfuscatedName("lw") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("head") Node head; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("index") int index; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Llp;)V" + signature = "(Lln;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,6 +46,15 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; } + public void remove() { + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.remove(); + this.last = null; + } + } + public Object next() { Node var1; if (this.hashTable.buckets[this.index - 1] != this.head) { @@ -68,15 +77,6 @@ public class IterableNodeHashTableIterator implements Iterator { } } - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.remove(); - this.last = null; - } - } - public boolean hasNext() { if (this.hashTable.buckets[this.index - 1] != this.head) { return true; diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 37c51fa9a5..baccbffca6 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,47 +1,33 @@ import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fm") +@ObfuscatedName("fh") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("i") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -27692753 - ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("h") + public static File JagexCache_locationFile; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lme;" + signature = "Lms;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lme;" + signature = "Lms;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lme;" + signature = "Lms;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("gs") - @Export("xteaKeys") - static int[][] xteaKeys; static { JagexCache_randomDat = null; @@ -49,142 +35,27 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("l") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-462100671" + signature = "(Lkb;I)Ljava/lang/String;", + garbageValue = "677991921" ) - static int method3566(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? class186.field2331 : MidiPcmStream.field2444; + public static String method3577(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { + var2 = 32767; + } + + 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 var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]); - return 1; - } else { - --Message.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - class320.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var4.parent = SpriteMask.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.field2713 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --class320.Interpreter_intStackSize; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - class320.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]}; - ClanChat.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - class320.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - GrandExchangeOfferWorldComparator.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - GrandExchangeOfferWorldComparator.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --class320.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - class192.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class192.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - class320.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class320.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 + class320.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class320.Interpreter_intStackSize + 1]; - } - } - } else { - class320.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - ClanChat.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } + return var1; } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index d1b902b856..088268ec68 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,94 +2,90 @@ 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("at") +@ObfuscatedName("bo") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("rm") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lbu;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lat;" + signature = "Lbo;" ) @Export("KeyHandler_instance") - static KeyHandler KeyHandler_instance; - @ObfuscatedName("p") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("cf") + public static KeyHandler KeyHandler_instance; + @ObfuscatedName("cg") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cu") - static int[] field399; - @ObfuscatedName("cy") - @ObfuscatedGetter( - intValue = 703429313 - ) - static int field400; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = -1486976357 - ) - static int field387; - @ObfuscatedName("cw") - static char[] field410; - @ObfuscatedName("cq") - static int[] field403; + @ObfuscatedName("cn") + public static int[] field427; @ObfuscatedName("ci") - public static int[] field404; + @ObfuscatedGetter( + intValue = 2127581229 + ) + public static int field439; + @ObfuscatedName("cz") + @ObfuscatedGetter( + intValue = -462249185 + ) + public static int field429; + @ObfuscatedName("cb") + static char[] field424; + @ObfuscatedName("cy") + static int[] field414; + @ObfuscatedName("ct") + public static int[] field432; + @ObfuscatedName("cf") + @ObfuscatedGetter( + intValue = 1915642037 + ) + public static int field417; @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -617516983 + intValue = 664645249 ) - public static int field405; - @ObfuscatedName("cc") + public static int field434; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1714214597 + intValue = -1397351623 ) - static int field406; - @ObfuscatedName("ch") + public static int field433; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -168140991 + intValue = 1677444807 ) - static int field407; - @ObfuscatedName("cx") + public static int field436; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 1711084141 - ) - static int field408; - @ObfuscatedName("cl") - @ObfuscatedGetter( - intValue = -1956753403 + intValue = 301071653 ) @Export("KeyHandler_idleCycles") - static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cs") + public static volatile int KeyHandler_idleCycles; + @ObfuscatedName("ce") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; + @ObfuscatedName("gv") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field399 = new int[128]; - field400 = 0; - field387 = 0; - field410 = new char[128]; - field403 = new int[128]; - field404 = new int[128]; - field405 = 0; - field406 = 0; - field407 = 0; - field408 = 0; + field427 = new int[128]; + field439 = 0; + field429 = 0; + field424 = new char[128]; + field414 = new int[128]; + field432 = new int[128]; + field417 = 0; + field434 = 0; + field433 = 0; + field436 = 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}; } @@ -97,6 +93,30 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { + var2 = KeyHandler_keyCodes[var2] & -129; + } else { + var2 = -1; + } + + if (field429 >= 0 && var2 >= 0) { + field427[field429] = ~var2; + field429 = field429 + 1 & 127; + if (field439 == field429) { + field429 = -1; + } + } + } + + var1.consume(); + } + + public final void focusGained(FocusEvent var1) { + } + public final synchronized void keyPressed(KeyEvent var1) { if (KeyHandler_instance != null) { int var2 = var1.getKeyCode(); @@ -109,21 +129,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field387 >= 0 && var2 >= 0) { - field399[field387] = var2; - field387 = field387 + 1 & 127; - if (field387 == field400) { - field387 = -1; + if (field429 >= 0 && var2 >= 0) { + field427[field429] = var2; + field429 = field429 + 1 & 127; + if (field429 == field439) { + field429 = -1; } } int var3; if (var2 >= 0) { - var3 = field407 + 1 & 127; - if (var3 != field406) { - field403[field407] = var2; - field410[field407] = 0; - field407 = var3; + var3 = field433 + 1 & 127; + if (var3 != field434) { + field414[field433] = var2; + field424[field433] = 0; + field433 = var3; } } @@ -145,11 +165,11 @@ public final class KeyHandler implements KeyListener, FocusListener { } else { label59: { if (var2 != 0) { - char[] var7 = class288.cp1252AsciiExtension; + char[] var7 = class297.cp1252AsciiExtension; for (int var5 = 0; var5 < var7.length; ++var5) { char var6 = var7[var5]; - if (var2 == var6) { + if (var6 == var2) { var3 = true; break label59; } @@ -161,11 +181,11 @@ public final class KeyHandler implements KeyListener, FocusListener { } if (var3) { - int var4 = field407 + 1 & 127; - if (var4 != field406) { - field403[field407] = -1; - field410[field407] = var2; - field407 = var4; + int var4 = field433 + 1 & 127; + if (var4 != field434) { + field414[field433] = -1; + field424[field433] = var2; + field433 = var4; } } } @@ -176,189 +196,77 @@ public final class KeyHandler implements KeyListener, FocusListener { public final synchronized void focusLost(FocusEvent var1) { if (KeyHandler_instance != null) { - field387 = -1; + field429 = -1; } } - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2] & -129; - } else { - var2 = -1; - } - - if (field387 >= 0 && var2 >= 0) { - field399[field387] = ~var2; - field387 = field387 + 1 & 127; - if (field387 == field400) { - field387 = -1; - } - } - } - - var1.consume(); - } - - @ObfuscatedName("t") - public static boolean method850(long var0) { - return var0 != 0L && !WorldMapData_1.method732(var0); - } - - @ObfuscatedName("hg") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZLks;B)V", - garbageValue = "77" + signature = "(B)[Lgv;", + garbageValue = "34" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field766 = 0; - Client.field690 = 0; - ClientPreferences.method1852(); + @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}; + } - int var2; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - var2 = var1.readBits(15); - if (var2 == 32767) { - break; - } + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Liy;I)V", + garbageValue = "-689678627" + ) + public static void method940(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; + } - 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; - } - } - - var4.definition = NetCache.getNpcDefinition(var1.readBits(14)); - 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.field867[++Client.field690 - 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.field942 = var4.definition.size * 64; - var4.field975 = var4.definition.rotation; - if (var4.field975 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.readySequence = var4.definition.readySequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method2077(class192.localPlayer.pathX[0] + var9, class192.localPlayer.pathY[0] + var5, var7 == 1); - } - - var1.exportIndex(); - class49.method866(var1); - - for (var2 = 0; var2 < Client.field766; ++var2) { - int var10 = Client.field828[var2]; - if (Client.npcs[var10].npcCycle != Client.cycle) { - Client.npcs[var10].definition = null; - Client.npcs[var10] = null; + @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 (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); - } - } + 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) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); } } - @ObfuscatedName("jz") + @ObfuscatedName("gr") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1886684971" + signature = "(Lcw;IB)V", + garbageValue = "3" ) - static final void method848() { - PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2298, 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) { - class185.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - signature = "(IIIILlt;Lhf;S)V", - garbageValue = "19802" - ) - @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; - ArchiveLoader.redHintArrowSprite.method6242(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - Script.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - + static final void method939(Actor var0, int var1) { + WorldMapSection0.worldToScreen(var0.x, var0.y, var1); } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 2e981ef871..959916d936 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,52 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("ib") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("t") + static AbstractArchive KitDefinition_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("e") + static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1436575363 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1923547411 + intValue = -724929863 + ) + static int field3271; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1932693097 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("models2") int[] models2; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("models") int[] models; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("nonSelectable") public boolean nonSelectable; @@ -63,10 +74,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "1" + signature = "(Lkb;I)V", + garbageValue = "1401612766" ) @Export("decode") void decode(Buffer var1) { @@ -80,10 +91,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "1396664482" + signature = "(Lkb;IB)V", + garbageValue = "53" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -126,10 +137,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "16777215" + signature = "(B)Z", + garbageValue = "1" ) @Export("ready") public boolean ready() { @@ -148,10 +159,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Ldg;", - garbageValue = "847526652" + signature = "(I)Lea;", + garbageValue = "-898584179" ) @Export("getModelData") public ModelData getModelData() { @@ -188,12 +199,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-464506453" + garbageValue = "1856166332" ) - public boolean method4533() { + public boolean method4523() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -205,10 +216,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Ldg;", - garbageValue = "-2095950315" + signature = "(I)Lea;", + garbageValue = "2142658297" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -238,100 +249,17 @@ public class KitDefinition extends DualNode { return var5; } - @ObfuscatedName("t") + @ObfuscatedName("jp") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "116" + signature = "(Lhe;B)Lhe;", + garbageValue = "-1" ) - static final void method4532(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) { - InterfaceParent.field565[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } + static Widget method4538(Widget var0) { + Widget var1 = GrandExchangeOfferTotalQuantityComparator.method181(var0); + if (var1 == null) { + var1 = var0.parent; } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "93" - ) - @Export("parseIntCustomRadix") - static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var10 + var5 * var1; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } + return var1; } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index dc9d863197..5c0b21d8da 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -1,3 +1,4 @@ +import java.net.URL; import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -8,92 +9,80 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gl") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgl;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "[Lgl;" ) @Export("Language_valuesOrdered") static final Language[] Language_valuesOrdered; - @ObfuscatedName("fy") - @ObfuscatedGetter( - intValue = -175340917 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("fq") - @ObfuscatedGetter( - intValue = 714439481 - ) - static int field2359; - @ObfuscatedName("jm") + @ObfuscatedName("lr") @ObfuscatedSignature( - signature = "Ldr;" + signature = "Lhe;" ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("l") - final String field2361; - @ObfuscatedName("j") + static Widget field2368; + @ObfuscatedName("z") + final String field2364; + @ObfuscatedName("t") @Export("language") final String language; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1330726969 + intValue = 2085500911 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", class192.field2380, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class192.field2380, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class192.field2380, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class192.field2380, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class192.field2382, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class192.field2382, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2380, 6, "MX"); - Language[] var0 = method3716(); + Language_EN = new Language("EN", "en", "English", class201.field2375, 0, "GB"); + Language_DE = new Language("DE", "de", "German", class201.field2375, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", class201.field2375, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", class201.field2375, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", class201.field2376, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", class201.field2376, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class201.field2375, 6, "MX"); + Language[] var0 = method3733(); Language_valuesOrdered = new Language[var0.length]; Language[] var1 = var0; @@ -109,10 +98,10 @@ public class Language implements Enumerated { } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgp;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgd;ILjava/lang/String;)V" ) - Language(String var1, String var2, String var3, class192 var4, int var5, String var6) { - this.field2361 = var1; + Language(String var1, String var2, String var3, class201 var4, int var5, String var6) { + this.field2364 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -123,20 +112,20 @@ public class Language implements Enumerated { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-101" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1528954067" ) @Export("getLanguage") String getLanguage() { return this.language; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { @@ -147,30 +136,128 @@ public class Language implements Enumerated { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1944388851" + signature = "(B)V", + garbageValue = "75" ) - static String method3728(int var0) { - return ""; + 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; + } 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("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)[Lgl;", - garbageValue = "-78751663" + signature = "(I)[Lii;", + garbageValue = "806638344" ) - static Language[] method3716() { - return new Language[]{Language_PT, Language_NL, Language_DE, Language_EN, Language_ES_MX, Language_ES, Language_FR}; + static ServerBuild[] method3751() { + return new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.RC, ServerBuild.LIVE}; } - @ObfuscatedName("o") + @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(class201.field2390)); + } 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); + } + } + + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)Lgl;", - garbageValue = "523180108" + garbageValue = "-1926428299" ) - public static Language method3711(int var0) { + public static Language method3736(int var0) { return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 48e4d1024b..b6538ab0b2 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("fq") +@ObfuscatedName("gt") @Implements("Link") public class Link { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lgt;" ) @Export("previous") public Link previous; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lgt;" ) @Export("next") public Link next; - @ObfuscatedName("c") + @ObfuscatedName("x") @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 62456139d7..8a9d404db8 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("jr") +@ObfuscatedName("jk") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lgt;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lgt;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfq;)V" + signature = "(Lgt;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Lfq;" + signature = "()Lgt;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lfq;" + signature = "()Lgt;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 191de0964c..41df5ff65f 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,140 +5,140 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cy") @Implements("Login") public class Login { - @ObfuscatedName("t") - static boolean field1163; - @ObfuscatedName("o") + @ObfuscatedName("m") + static boolean field1205; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1501257187 + intValue = -1204959409 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Llt;" + signature = "[Lle;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lla;" ) @Export("leftTitleSprite") static Sprite leftTitleSprite; - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Lli;" + signature = "Lle;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("y") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lle;" + ) + static IndexedSprite field1195; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -130819791 + intValue = 677991921 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -515852009 + intValue = 351147085 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 591976709 + intValue = 811959291 ) - static int field1165; - @ObfuscatedName("ay") + static int field1201; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -366456801 + intValue = -1263209859 ) - static int field1193; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lll;" - ) - static Bounds field1175; - @ObfuscatedName("ak") + static int field1218; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -2042925581 + intValue = -1027214845 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("Login_response2") static String Login_response2; @ObfuscatedName("av") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Login_username") static String Login_username; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @Export("Login_password") static String Login_password; - @ObfuscatedName("ab") - static boolean field1183; - @ObfuscatedName("ap") - static boolean field1184; - @ObfuscatedName("bf") - static boolean field1185; + @ObfuscatedName("ah") + static boolean field1207; + @ObfuscatedName("ag") + static boolean field1212; @ObfuscatedName("bc") + static boolean field1214; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 2063292443 + intValue = 463020899 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("ba") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -921814137 + intValue = 1533382117 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1630219319 + intValue = 623076751 ) @Export("worldSelectPage") static int worldSelectPage; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -2032377127 + intValue = 1665656509 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bh") + @ObfuscatedName("bm") @ObfuscatedGetter( - longValue = 5886153640443907315L + longValue = 7899458563171084207L ) - static long field1180; - @ObfuscatedName("bg") + static long field1223; + @ObfuscatedName("bb") @ObfuscatedGetter( - longValue = 3027012337338464175L + longValue = -6287034345881583105L ) - static long field1194; + static long field1224; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1165 = -1; - field1193 = 1; + field1201 = -1; + field1218 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -146,17 +146,36 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field1183 = false; - field1184 = false; - field1185 = true; + field1207 = false; + field1212 = false; + field1214 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; worldSelectPage = 0; worldSelectPagesCount = 0; new DecimalFormat("##0.00"); - new class162(); - field1180 = -1L; - field1194 = -1L; + new class171(); + field1223 = -1L; + field1224 = -1L; + } + + @ObfuscatedName("lo") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2118716971" + ) + 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); + } + } + } + } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index f4e6730374..7e425b1fa2 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,59 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gb") @Implements("LoginPacket") -public class LoginPacket implements class181 { - @ObfuscatedName("c") +public class LoginPacket implements class190 { + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgb;" ) - public static final LoginPacket field2310; - @ObfuscatedName("t") + public static final LoginPacket field2315; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgb;" ) - static final LoginPacket field2307; - @ObfuscatedName("o") + static final LoginPacket field2311; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgb;" ) - public static final LoginPacket field2308; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lge;" - ) - public static final LoginPacket field2313; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lge;" - ) - static final LoginPacket field2306; + public static final LoginPacket field2317; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Lge;" + signature = "Lgb;" ) - @Export("LoginPacket_indexedValues") - static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("g") + public static final LoginPacket field2313; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final LoginPacket field2314; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgb;" + ) + static final LoginPacket field2319; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "[Lgb;" + ) + static final LoginPacket[] LoginPacked_indexedValues; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lew;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 707604483 + intValue = 774244909 ) @Export("id") public final int id; static { - field2310 = new LoginPacket(14, 0); - field2307 = new LoginPacket(15, 4); - field2308 = new LoginPacket(16, -2); + field2315 = new LoginPacket(14, 0); + field2311 = new LoginPacket(15, 4); + field2317 = new LoginPacket(16, -2); field2313 = new LoginPacket(18, -2); - field2306 = new LoginPacket(27, 0); - LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field2310, field2306, field2308, field2313, field2307}; - LoginPacket[] var1 = var0; + field2314 = new LoginPacket(19, -2); + field2319 = new LoginPacket(27, 0); + LoginPacked_indexedValues = new LoginPacket[32]; + LoginPacket[] var0 = class51.method895(); - for (int var2 = 0; var2 < var1.length; ++var2) { - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; + for (int var1 = 0; var1 < var0.length; ++var1) { + LoginPacked_indexedValues[var0[var1].id] = var0[var1]; } } @@ -68,4 +78,13 @@ public class LoginPacket implements class181 { LoginPacket(int var1, int var2) { this.id = var1; } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1902674476" + ) + static final void method3692() { + GrandExchangeEvent.method165("Your friend list is full. Max of 200 for free users, and 400 for members"); + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 96421ff8e6..3a4575e6f9 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -3,213 +3,212 @@ 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("cr") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("bq") - @Export("otp") - static String otp; - @ObfuscatedName("c") + @ObfuscatedName("ap") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lli;" + signature = "[Lle;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("d") - int[] field1025; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -630386699 - ) - int field1031; - @ObfuscatedName("j") - int[] field1027; - @ObfuscatedName("m") - int[] field1028; - @ObfuscatedName("p") - int[] field1033; - @ObfuscatedName("h") - int[] field1029; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -598170965 - ) - int field1021; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1894077161 - ) - int field1032; - @ObfuscatedName("x") - int[] field1040; - @ObfuscatedName("w") - int[] field1034; - @ObfuscatedName("k") - int[] field1035; @ObfuscatedName("q") - int[] field1030; + int[] field1059; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1981807145 + intValue = -860296683 ) - int field1037; - @ObfuscatedName("y") + int field1060; + @ObfuscatedName("t") + int[] field1074; + @ObfuscatedName("e") + int[] field1062; + @ObfuscatedName("s") + int[] field1065; + @ObfuscatedName("p") + int[] field1064; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1837953616 + intValue = 1214831443 ) - int field1038; - @ObfuscatedName("f") + int field1063; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1636512933 + intValue = 44096223 ) - int field1039; + int field1066; + @ObfuscatedName("h") + int[] field1057; + @ObfuscatedName("g") + int[] field1068; + @ObfuscatedName("i") + int[] field1069; + @ObfuscatedName("a") + int[] field1070; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -702282245 + ) + int field1055; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1031102693 + ) + int field1072; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1396943377 + ) + int field1073; @ObfuscatedSignature( - signature = "([Lli;)V" + signature = "([Lle;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1025 = new int[256]; - this.field1031 = 0; - this.field1021 = 0; - this.field1032 = 0; - this.field1037 = 0; - this.field1038 = 0; - this.field1039 = 0; + this.field1059 = new int[256]; + this.field1060 = 0; + this.field1063 = 0; + this.field1066 = 0; + this.field1055 = 0; + this.field1072 = 0; + this.field1073 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "956561052" + garbageValue = "-542018665" ) @Export("initColors") void initColors() { - this.field1028 = new int[256]; + this.field1062 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1] = var1 * 262144; + this.field1062[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 64] = var1 * 1024 + 16711680; + this.field1062[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 128] = var1 * 4 + 16776960; + this.field1062[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1028[var1 + 192] = 16777215; + this.field1062[var1 + 192] = 16777215; } - this.field1033 = new int[256]; + this.field1065 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1033[var1] = var1 * 1024; + this.field1065[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1033[var1 + 64] = var1 * 4 + 65280; + this.field1065[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1033[var1 + 128] = var1 * 262144 + 65535; + this.field1065[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1033[var1 + 192] = 16777215; + this.field1065[var1 + 192] = 16777215; } - this.field1029 = new int[256]; + this.field1064 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1029[var1] = var1 * 4; + this.field1064[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1029[var1 + 64] = var1 * 262144 + 255; + this.field1064[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1029[var1 + 128] = var1 * 1024 + 16711935; + this.field1064[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1029[var1 + 192] = 16777215; + this.field1064[var1 + 192] = 16777215; } - this.field1027 = new int[256]; - this.field1037 = 0; - this.field1035 = new int[32768]; - this.field1030 = new int[32768]; - this.method1811((IndexedSprite)null); - this.field1040 = new int[32768]; - this.field1034 = new int[32768]; + this.field1074 = new int[256]; + this.field1055 = 0; + 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("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1696836035" + garbageValue = "41185107" ) - void method1834() { - this.field1028 = null; - this.field1033 = null; - this.field1029 = null; - this.field1027 = null; - this.field1035 = null; - this.field1030 = null; - this.field1040 = null; - this.field1034 = null; - this.field1037 = 0; - this.field1038 = 0; + void method1909() { + this.field1062 = null; + this.field1065 = null; + this.field1064 = null; + this.field1074 = null; + this.field1069 = null; + this.field1070 = null; + this.field1057 = null; + this.field1068 = null; + this.field1055 = 0; + this.field1072 = 0; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-321629645" + signature = "(IIB)V", + garbageValue = "10" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1040 == null) { + if (this.field1057 == null) { this.initColors(); } - if (this.field1039 == 0) { - this.field1039 = var2; + if (this.field1073 == 0) { + this.field1073 = var2; } - int var3 = var2 - this.field1039; + int var3 = var2 - this.field1073; if (var3 >= 256) { var3 = 0; } - this.field1039 = var2; + this.field1073 = var2; if (var3 > 0) { - this.method1806(var3); + this.method1912(var3); } - this.method1838(var1); + this.method1919(var1); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "1" + signature = "(II)V", + garbageValue = "2136809713" ) - final void method1806(int var1) { - this.field1037 += var1 * 128; + final void method1912(int var1) { + this.field1055 += 128 * var1; int var2; - if (this.field1037 > this.field1035.length) { - this.field1037 -= this.field1035.length; + if (this.field1055 > this.field1069.length) { + this.field1055 -= this.field1069.length; var2 = (int)(Math.random() * 12.0D); - this.method1811(this.sprites[var2]); + this.method1917(this.sprites[var2]); } var2 = 0; @@ -218,12 +217,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1040[var3 + var2] - this.field1035[var2 + this.field1037 & this.field1035.length - 1] * var1 / 6; + var6 = this.field1057[var2 + var3] - this.field1069[var2 + this.field1055 & this.field1069.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1040[var2++] = var6; + this.field1057[var2++] = var6; } byte var15 = 10; @@ -237,42 +236,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.field1040[var8 + var9] = 255; + this.field1057[var8 + var9] = 255; } else { - this.field1040[var9 + var8] = 0; + this.field1057[var8 + var9] = 0; } } } - if (this.field1021 * 16 > 0) { - this.field1021 = this.field1021 * 16 - var1 * 4; + if (this.field1063 > 0) { + this.field1063 -= var1 * 4; } - if (this.field1032 * 16 > 0) { - this.field1032 = this.field1032 * 16 - var1 * 4; + if (this.field1066 > 0) { + this.field1066 -= var1 * 4; } - if (this.field1021 * 16 == 0 && this.field1032 * 16 == 0) { + if (this.field1063 == 0 && this.field1066 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1021 = 1024; + this.field1063 = 1024; } if (var7 == 1) { - this.field1032 = 1024; + this.field1066 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1025[var7] = this.field1025[var7 + var1]; + this.field1059[var7] = this.field1059[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1025[var7] = (int)(Math.sin((double)this.field1031 / 14.0D) * 16.0D + Math.sin((double)this.field1031 / 15.0D) * 14.0D + Math.sin((double)this.field1031 / 16.0D) * 12.0D); - ++this.field1031; + 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.field1038 = this.field1038 * 10000 + 10000 * var1; + this.field1072 += var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -282,13 +281,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1038 * 100; ++var11) { + for (var11 = 0; var11 < this.field1072 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1040[var12 + (var13 << 7)] = 192; + this.field1057[var12 + (var13 << 7)] = 192; } - this.field1038 = 0; + this.field1072 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -297,15 +296,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { if (var14 + var7 < 128) { - var12 += this.field1040[var7 + var13 + var14]; + var12 += this.field1057[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1040[var13 + var14 - (var7 + 1)]; + var12 -= this.field1057[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1034[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1068[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -316,15 +315,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1034[var14 + var11 + var7 * 128]; + var12 += this.field1068[var14 + var11 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1034[var14 + var11 - (var7 + 1) * 128]; + var12 -= this.field1068[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1040[var14 + var11] = var12 / (var7 * 2 + 1); + this.field1057[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -332,66 +331,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(IIII)I", - garbageValue = "-2098157242" + garbageValue = "743870455" ) - final int method1807(int var1, int var2, int var3) { + final int method1940(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "124" + signature = "(II)V", + garbageValue = "-803188196" ) - final void method1838(int var1) { - int var2 = this.field1027.length; - if (this.field1021 * 16 > 0) { - this.method1809(this.field1021 * 16, this.field1033); - } else if (this.field1032 * 16 > 0) { - this.method1809(this.field1032 * 16, this.field1029); + 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); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1027[var3] = this.field1028[var3]; + this.field1074[var3] = this.field1062[var3]; } } - this.method1816(var1); + this.method1916(var1); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I[II)V", - garbageValue = "1172962335" + garbageValue = "1786403761" ) - final void method1809(int var1, int[] var2) { - int var3 = this.field1027.length; + final void method1915(int var1, int[] var2) { + int var3 = this.field1074.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1027[var4] = this.method1807(this.field1028[var4], var2[var4], 1024 - var1); + this.field1074[var4] = this.method1940(this.field1062[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1027[var4] = var2[var4]; + this.field1074[var4] = var2[var4]; } else { - this.field1027[var4] = this.method1807(var2[var4], this.field1028[var4], 256 - var1); + this.field1074[var4] = this.method1940(var2[var4], this.field1062[var4], 256 - var1); } } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "910695492" + garbageValue = "-1017589056" ) - final void method1816(int var1) { + final void method1916(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1025[var3] / 256; + int var4 = (256 - var3) * this.field1059[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -400,22 +399,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= DevicePcmPlayerProvider.rasterProvider.width) { - var7 = DevicePcmPlayerProvider.rasterProvider.width - var5; + if (var5 + 128 >= class206.rasterProvider.width) { + var7 = class206.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * DevicePcmPlayerProvider.rasterProvider.width; + int var8 = var5 + (var3 + 8) * class206.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1040[var2++]; + int var10 = this.field1057[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.field1027[var10]; - int var14 = DevicePcmPlayerProvider.rasterProvider.pixels[var8]; - DevicePcmPlayerProvider.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; + 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; } else { ++var8; } @@ -426,21 +425,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lli;I)V", - garbageValue = "16711935" + signature = "(Lle;I)V", + garbageValue = "-61779781" ) - final void method1811(IndexedSprite var1) { + final void method1917(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1035.length; ++var2) { - this.field1035[var2] = 0; + for (var2 = 0; var2 < this.field1069.length; ++var2) { + this.field1069[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1035[var3] = (int)(Math.random() * 256.0D); + this.field1069[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -449,13 +448,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1030[var5] = (this.field1035[var5 + 1] + this.field1035[var5 - 128] + this.field1035[var5 + 128] + this.field1035[var5 - 1]) / 4; + this.field1070[var5] = (this.field1069[var5 + 128] + this.field1069[var5 - 128] + this.field1069[var5 + 1] + this.field1069[var5 - 1]) / 4; } } - int[] var8 = this.field1035; - this.field1035 = this.field1030; - this.field1030 = var8; + int[] var8 = this.field1069; + this.field1069 = this.field1070; + this.field1070 = var8; } if (var1 != null) { @@ -467,7 +466,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1035[var7] = 0; + this.field1069[var7] = 0; } } } @@ -475,381 +474,68 @@ public class LoginScreenAnimation { } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1539324178" + signature = "(IB)Z", + garbageValue = "1" ) - static int method1835(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return WorldMapAreaData.method706(var0, var1, var2); - } else if (var0 < 1100) { - return MenuAction.method2106(var0, var1, var2); - } else if (var0 < 1200) { - return class2.method34(var0, var1, var2); - } else if (var0 < 1300) { - return Players.method2203(var0, var1, var2); - } else if (var0 < 1400) { - return JagexCache.method3566(var0, var1, var2); - } else if (var0 < 1500) { - return Player.method1300(var0, var1, var2); - } else if (var0 < 1600) { - return PacketBufferNode.method3697(var0, var1, var2); - } else if (var0 < 1700) { - return UserList.method5212(var0, var1, var2); - } else if (var0 < 1800) { - return NPCDefinition.method4818(var0, var1, var2); - } else if (var0 < 1900) { - return WorldMapData_0.method175(var0, var1, var2); - } else if (var0 < 2000) { - return class42.method810(var0, var1, var2); - } else if (var0 < 2100) { - return MenuAction.method2106(var0, var1, var2); - } else if (var0 < 2200) { - return class2.method34(var0, var1, var2); - } else if (var0 < 2300) { - return Players.method2203(var0, var1, var2); - } else if (var0 < 2400) { - return JagexCache.method3566(var0, var1, var2); - } else if (var0 < 2500) { - return Player.method1300(var0, var1, var2); - } else if (var0 < 2600) { - return NetSocket.method3608(var0, var1, var2); - } else if (var0 < 2700) { - return ViewportMouse.method3037(var0, var1, var2); - } else if (var0 < 2800) { - return InterfaceParent.method1191(var0, var1, var2); - } else if (var0 < 2900) { - return Players.method2200(var0, var1, var2); - } else if (var0 < 3000) { - return class42.method810(var0, var1, var2); - } else if (var0 < 3200) { - return UserComparator5.method3491(var0, var1, var2); - } else if (var0 < 3300) { - return WallDecoration.method3357(var0, var1, var2); - } else if (var0 < 3400) { - return SecureRandomFuture.method2169(var0, var1, var2); - } else if (var0 < 3500) { - return class223.method4193(var0, var1, var2); - } else if (var0 < 3700) { - return MusicPatch.method3962(var0, var1, var2); - } else if (var0 < 4000) { - return StructDefinition.method4627(var0, var1, var2); - } else if (var0 < 4100) { - return TileItemPile.method2834(var0, var1, var2); - } else if (var0 < 4200) { - return GraphicsDefaults.method5955(var0, var1, var2); - } else if (var0 < 4300) { - return class215.method4100(var0, var1, var2); - } else if (var0 < 5100) { - return method1808(var0, var1, var2); - } else if (var0 < 5400) { - return HealthBarUpdate.method1759(var0, var1, var2); - } else if (var0 < 5600) { - return FriendSystem.method1920(var0, var1, var2); - } else if (var0 < 5700) { - return WorldMapSectionType.method245(var0, var1, var2); - } else if (var0 < 6300) { - return ReflectionCheck.method2348(var0, var1, var2); - } else if (var0 < 6600) { - return WorldMapCacheName.method633(var0, var1, var2); - } else { - return var0 < 6700 ? UrlRequest.method3382(var0, var1, var2) : 2; - } + public static boolean method1939(int var0) { + return (var0 & 1) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-2014430142" + signature = "(II)Z", + garbageValue = "304486433" ) - static final void method1837(String var0) { - class60.method1188(var0 + " is already on your friend list"); - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "580848394" - ) - static int method1808(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - class320.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - WorldMapSectionType.privateChatMode = UserComparator9.method3461(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - if (WorldMapSectionType.privateChatMode == null) { - WorldMapSectionType.privateChatMode = PrivateChatMode.field3790; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = TilePaint.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(WorldMapSectionType.privateChatMode.field3787); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + return false; } else { - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - class320.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = TilePaint.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + Widget.Widget_loadedInterfaces[var0] = true; + return true; } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - class320.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Message var15 = WorldMapRectangle.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Message var16 = class43.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (WorldMapSectionType.privateChatMode == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSectionType.privateChatMode.field3787; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.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 (FriendLoginUpdate.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 (FriendLoginUpdate.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()); - } - } - - PacketBufferNode var8 = TilePaint.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - GrandExchangeOfferTotalQuantityComparator.method104(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - Message.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = TilePaint.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - GrandExchangeOfferTotalQuantityComparator.method104(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[++class320.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class51.Messages_getHistorySize(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class13.Messages_getNextChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ItemDefinition.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - NetCache.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field780 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Client.field780; - return 1; - } else if (var0 == ScriptOpcodes.DEBUGMES) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (class192.localPlayer != null && class192.localPlayer.username != null) { - var3 = class192.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; - return 1; + 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)); + } + } + } + } + + Widget.Widget_loadedInterfaces[var0] = true; + return true; } } } - @ObfuscatedName("gk") + @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "115582492" + signature = "(II)V", + garbageValue = "-232699215" ) - static boolean method1819() { - return (Client.drawPlayerNames & 1) != 0; + 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 9890f42cad..ab0a7a5853 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("mv") +@ObfuscatedName("mx") @Implements("LoginType") public class LoginType { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) - static final LoginType field4034; - @ObfuscatedName("o") + static final LoginType field4049; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) - static final LoginType field4030; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lmv;" - ) - static final LoginType field4031; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lmv;" - ) - static final LoginType field4032; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lmv;" - ) - static final LoginType field4033; + static final LoginType field4051; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) - static final LoginType field4028; - @ObfuscatedName("l") + static final LoginType field4052; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) - static final LoginType field4035; - @ObfuscatedName("j") + static final LoginType field4057; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lmv;" + signature = "Lmx;" ) - public static final LoginType field4029; - @ObfuscatedName("m") + static final LoginType field4059; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lmx;" + ) + static final LoginType field4055; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lmx;" + ) + static final LoginType field4056; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lmx;" + ) + public static final LoginType field4054; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1632113899 + intValue = 838731047 ) - final int field4037; - @ObfuscatedName("p") - final String field4038; + final int field4058; + @ObfuscatedName("s") + final String field4053; static { - oldscape = new LoginType(0, 0, "", ""); - field4034 = new LoginType(2, 1, "", ""); - field4030 = new LoginType(7, 2, "", ""); - field4031 = new LoginType(8, 3, "", ""); - field4032 = new LoginType(4, 4, "", ""); - field4033 = new LoginType(6, 5, "", ""); - field4028 = new LoginType(5, 6, "", ""); - field4035 = new LoginType(3, 7, "", ""); - field4029 = new LoginType(1, -1, "", "", true, new LoginType[]{oldscape, field4034, field4030, field4032, field4031}); + 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}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4037 = var1; - this.field4038 = var4; + this.field4058 = var1; + this.field4053 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmv;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmx;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4037 = var1; - this.field4038 = var4; + this.field4058 = var1; + this.field4053 = var4; } public String toString() { - return this.field4038; + return this.field4053; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 2ed5714563..27ea579be3 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -3,158 +3,44 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ck") +@ObfuscatedName("ci") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -171831145 + @ObfuscatedName("eh") + @ObfuscatedSignature( + signature = "Lih;" ) - @Export("param0") - int param0; - @ObfuscatedName("t") - @Export("action") - String action; - @ObfuscatedName("o") + @Export("archive17") + static Archive archive17; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -923254575 + intValue = -1152596883 ) @Export("param1") int param1; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1388301791 + intValue = 950122555 + ) + @Export("param0") + int param0; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 935644857 ) @Export("opcode") int opcode; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 455082071 + intValue = -83774921 ) @Export("identifier") int identifier; + @ObfuscatedName("w") + @Export("action") + String action; MenuAction() { } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lks;I)V", - garbageValue = "-1231997766" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class192.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 - Messages.baseX * 64; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - Language.baseY * 64; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - Clock.Client_plane = var2.plane = var4; - if (Players.field1235[var1] != null) { - var2.read(Players.field1235[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1236[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.field1236[var7] = 0; - } - } - - var0.exportIndex(); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1513709763" - ) - static int method2106(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var4 = Varps.getWidget(var3); - } else { - var4 = var2 ? class186.field2331 : MidiPcmStream.field2444; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - class320.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - NPCDefinition.invalidateWidget(var4); - Username.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - class320.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - NPCDefinition.invalidateWidget(var4); - Username.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - NPCDefinition.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-879378563" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); - } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 959c1cf5b6..8597d52f0e 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,68 +1,58 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bn") +@ObfuscatedName("by") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("at") + static String field633; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1052025849 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("kn") - @ObfuscatedGetter( - intValue = -757596803 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 586338987 + intValue = 659624387 ) @Export("count") int count; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1201129701 + intValue = -1682037485 ) @Export("cycle") int cycle; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 213775829 + intValue = -1650269491 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("sender") String sender; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lku;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("prefix") String prefix; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("text") String text; @@ -72,14 +62,14 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1939777476" + garbageValue = "1398956437" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = class4.method57(); + this.count = Player.method1342(); this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -90,20 +80,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "503642535" + garbageValue = "-1417196149" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "0" + garbageValue = "1" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -114,30 +104,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-1598313930" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = KeyHandler.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = Projectile.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2064859672" + signature = "(B)V", + garbageValue = "14" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-435736879" + signature = "(B)Z", + garbageValue = "-9" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -148,75 +138,152 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1506874350" + garbageValue = "-929873231" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = KeyHandler.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = Projectile.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1639936728" + garbageValue = "-2096124823" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(MouseRecorder.method1207(this.sender), class192.loginType); + this.senderUsername = new Username(Occluder.method3400(this.sender), WorldMapIcon_0.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)[Lic;", - garbageValue = "16777215" + signature = "(Liy;Liy;I)V", + garbageValue = "1388306890" ) - static VerticalAlignment[] method1229() { - return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3198, VerticalAlignment.field3196}; + public static void method1319(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); } - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-71" + signature = "(IIIII)V", + garbageValue = "2024763142" ) - static void method1228() { - Iterator var0 = Messages.Messages_hashTable.iterator(); + 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; + } - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromFriend(); + if (var2 > var4.field1100) { + var5 += var2 - var4.field1100; + } else if (var2 < var4.y) { + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field1106 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + 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; + } + } + } 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; + } + } + } } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1913324083" + signature = "(ILce;ZI)I", + garbageValue = "1301536744" ) - public static final void method1246(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } + 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; + } - @ObfuscatedName("jb") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-53" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + 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; + } } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 834444852b..002ae18f75 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -1,12 +1,3 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; import net.runelite.mapping.Export; @@ -14,38 +5,31 @@ 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("cy") +@ObfuscatedName("ck") @Implements("Messages") public class Messages { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljz;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 679666473 + intValue = 211996087 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("fa") - @ObfuscatedGetter( - intValue = -334817875 - ) - @Export("baseX") - static int baseX; static { Messages_channels = new HashMap(); @@ -54,125 +38,84 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)Lij;", - garbageValue = "126" + signature = "(IIIII)V", + garbageValue = "479861963" ) - @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)); + @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]; } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; + 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("o") + @ObfuscatedName("gq") @ObfuscatedSignature( - signature = "(Lks;I)V", - garbageValue = "1739946612" + signature = "(ZB)V", + garbageValue = "32" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int 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); + @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; } - 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); + 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); } } - - var0.writeCrc(var2); - var1.remove(); } + + } + + @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; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 6508f167e2..cd43500d1b 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("gg") +@ObfuscatedName("hc") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("m") - static final byte[] field2477; - @ObfuscatedName("c") + @ObfuscatedName("e") + static final byte[] field2478; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lkb;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("division") int division; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("g") - int[] field2473; - @ObfuscatedName("d") - int field2474; - @ObfuscatedName("j") - long field2476; + @ObfuscatedName("v") + int[] field2474; + @ObfuscatedName("q") + int field2471; + @ObfuscatedName("t") + long field2477; static { - field2477 = 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}; + 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}; } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("c") + @ObfuscatedName("x") @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.field2474 = 500000; + this.field2471 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2476 = 0L; + this.field2477 = 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.field2473 = new int[var2]; + this.field2474 = new int[var2]; } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2473 = null; + this.field2474 = null; } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2473[var1] = var5; + this.field2474[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2473[var1]; + var5 = this.field2474[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3914(var1, var5); + return this.method3934(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.field2473[var1] = var4; - return this.method3914(var1, var4); + this.field2474[var1] = var4; + return this.method3934(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("p") - int method3914(int var1, int var2) { + @ObfuscatedName("s") + int method3934(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.field2476 += (long)var6 * (long)(this.field2474 - var5); - this.field2474 = var5; + this.field2477 += (long)var6 * (long)(this.field2471 - var5); + this.field2471 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2477[var2 - 128]; + byte var3 = field2478[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("h") - long method3917(int var1) { - return this.field2476 + (long)var1 * (long)this.field2474; + @ObfuscatedName("p") + long method3935(int var1) { + return this.field2477 + (long)var1 * (long)this.field2471; } - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("reset") void reset(long var1) { - this.field2476 = var1; + this.field2477 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2473[var4] = 0; + this.field2474[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 3a4b12325c..a8e76f08ff 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,160 +4,161 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gi") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("v") + @ObfuscatedName("cn") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lbn;" ) - static Widget field2444; - @ObfuscatedName("c") + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -758577325 + intValue = 1512673055 ) - int field2434; - @ObfuscatedName("o") + int field2415; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1685666624 + intValue = 871751543 ) int field2419; - @ObfuscatedName("e") - int[] field2417; - @ObfuscatedName("i") - int[] field2421; - @ObfuscatedName("g") - int[] field2440; @ObfuscatedName("d") - int[] field2423; - @ObfuscatedName("l") int[] field2443; - @ObfuscatedName("j") - int[] field2418; - @ObfuscatedName("m") - int[] field2426; - @ObfuscatedName("p") + @ObfuscatedName("v") + int[] field2416; + @ObfuscatedName("q") + int[] field2417; + @ObfuscatedName("z") int[] field2420; - @ObfuscatedName("h") - int[] field2428; - @ObfuscatedName("y") - int[] field2429; - @ObfuscatedName("f") - int[] field2437; - @ObfuscatedName("b") - int[] field2431; - @ObfuscatedName("r") - int[] field2432; - @ObfuscatedName("s") - int[] field2433; - @ObfuscatedName("a") + @ObfuscatedName("t") + int[] field2421; + @ObfuscatedName("e") int[] field2422; - @ObfuscatedName("u") + @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; + @ObfuscatedName("j") + int[] field2432; + @ObfuscatedName("y") + int[] field2433; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[[Lgu;" + signature = "[[Lhz;" ) - MusicPatchNode[][] field2435; + MusicPatchNode[][] field2441; @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "[[Lgu;" + signature = "[[Lhz;" ) - MusicPatchNode[][] field2436; - @ObfuscatedName("af") + MusicPatchNode[][] field2435; + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Lgg;" + signature = "Lhc;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("az") - boolean field2438; - @ObfuscatedName("ax") + @ObfuscatedName("ai") + boolean field2418; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2133377523 + intValue = 1099692055 ) @Export("track") int track; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2127527165 + intValue = 1127320341 ) @Export("trackLength") int trackLength; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -7268027990425382261L + longValue = -9197860659257492463L ) - long field2441; - @ObfuscatedName("ay") + long field2440; + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = 1615665924720735765L + longValue = 573675785122514817L ) - long field2442; - @ObfuscatedName("aa") + long field2425; + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lhs;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2434 = 256; - this.field2419 = -727379968; - this.field2417 = new int[16]; - this.field2421 = new int[16]; - this.field2440 = new int[16]; - this.field2423 = new int[16]; + this.field2415 = 256; + this.field2419 = 1000000; this.field2443 = new int[16]; - this.field2418 = new int[16]; - this.field2426 = 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.field2437 = new int[16]; + this.field2430 = new int[16]; this.field2431 = new int[16]; this.field2432 = new int[16]; this.field2433 = new int[16]; - this.field2422 = new int[16]; + this.field2441 = new MusicPatchNode[16][128]; this.field2435 = new MusicPatchNode[16][128]; - this.field2436 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3878(); + this.method3812(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(II)V", + garbageValue = "-1144046220" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2434 = var1; + this.field2415 = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-102" + signature = "(I)I", + garbageValue = "688694968" ) - public int method3764() { - return this.field2434; + public int method3793() { + return this.field2415; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lgk;Lii;Ldv;II)Z", - garbageValue = "1923256640" + signature = "(Lhh;Liy;Ldk;II)Z", + garbageValue = "33477442" ) @Export("loadMusicTrack") - synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method3993(); + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method4007(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -168,7 +169,7 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { - var9 = GameShell.method1067(var2, var8); + var9 = class298.method5343(var2, var8); if (var9 == null) { var5 = false; continue; @@ -177,7 +178,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var9, (long)var8); } - if (!var9.method3952(var3, var7.byteArray, var6)) { + if (!var9.method3970(var3, var7.byteArray, var6)) { var5 = false; } } @@ -189,23 +190,23 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "564851445" ) @Export("clearAll") - synchronized void clearAll() { + public synchronized void clearAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-457364523" + garbageValue = "1029490375" ) @Export("removeAll") public synchronized void removeAll() { @@ -215,65 +216,65 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("l") - protected synchronized int vmethod3965() { + @ObfuscatedName("z") + protected synchronized int vmethod3984() { return 0; } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2419 * 1000000 / PcmPlayer.field1398; + int var4 = this.midiFile.division * this.field2419 / PcmPlayer.field1421; do { - long var5 = this.field2441 + (long)var3 * (long)var4; - if (this.field2442 - var5 >= 0L) { - this.field2441 = var5; + long var5 = (long)var4 * (long)var3 + this.field2440; + if (this.field2425 - var5 >= 0L) { + this.field2440 = var5; break; } - int var7 = (int)(((long)var4 + (this.field2442 - this.field2441) - 1L) / (long)var4); - this.field2441 += (long)var7 * (long)var4; + int var7 = (int)(((long)var4 + (this.field2425 - this.field2440) - 1L) / (long)var4); + this.field2440 += (long)var7 * (long)var4; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3796(); + this.method3825(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lgk;ZI)V", - garbageValue = "1689083592" + signature = "(Lhh;ZI)V", + garbageValue = "1158871386" ) @Export("setMusicTrack") - synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2438 = var2; - this.field2441 = 0L; + this.field2418 = var2; + this.field2440 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -284,193 +285,193 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2442 = this.midiFile.method3917(this.trackLength); + this.field2425 = this.midiFile.method3935(this.trackLength); } - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2419 * 1000000 / PcmPlayer.field1398; + int var2 = this.midiFile.division * this.field2419 / PcmPlayer.field1421; do { - long var3 = this.field2441 + (long)var1 * (long)var2; - if (this.field2442 - var3 >= 0L) { - this.field2441 = var3; + long var3 = this.field2440 + (long)var1 * (long)var2; + if (this.field2425 - var3 >= 0L) { + this.field2440 = var3; break; } - int var5 = (int)((this.field2442 - this.field2441 + (long)var2 - 1L) / (long)var2); - this.field2441 += (long)var5 * (long)var2; + int var5 = (int)((this.field2425 - this.field2440 + (long)var2 - 1L) / (long)var2); + this.field2440 += (long)var5 * (long)var2; this.patchStream.skip(var5); var1 -= var5; - this.method3796(); + this.method3825(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-18" + signature = "(I)V", + garbageValue = "1819276165" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3878(); + this.method3812(); } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-261574167" + garbageValue = "-799045616" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "89" + garbageValue = "82" ) - public synchronized void method3819(int var1, int var2) { - this.method3772(var1, var2); + public synchronized void method3800(int var1, int var2) { + this.method3801(var1, var2); } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "101" + signature = "(III)V", + garbageValue = "1696015287" ) - void method3772(int var1, int var2) { - this.field2423[var1] = var2; - this.field2418[var1] = var2 & -128; - this.method3773(var1, var2); + void method3801(int var1, int var2) { + this.field2420[var1] = var2; + this.field2422[var1] = var2 & -128; + this.method3802(var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "29980" + signature = "(III)V", + garbageValue = "1712067556" ) - void method3773(int var1, int var2) { - if (var2 != this.field2443[var1]) { - this.field2443[var1] = var2; + void method3802(int var1, int var2) { + if (var2 != this.field2421[var1]) { + this.field2421[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2436[var1][var3] = null; + this.field2435[var1][var3] = null; } } } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "547070105" + garbageValue = "-91684183" ) - void method3774(int var1, int var2, int var3) { - this.method3887(var1, var2, 64); - if ((this.field2429[var1] & 2) != 0) { + void method3808(int var1, int var2, int var3) { + this.method3805(var1, var2, 64); + if ((this.field2428[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2447 == var1 && var4.field2459 < 0) { - this.field2435[var1][var4.field2450] = null; - this.field2435[var1][var2] = var4; - int var5 = (var4.field2454 * var4.field2455 >> 12) + var4.field2446; - var4.field2446 += var2 - var4.field2450 << 8; - var4.field2454 = var5 - var4.field2446; + 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.field2450 = var2; + var4.field2464 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2443[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2421[var1]); if (var9 != null) { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2447 = var1; + var6.field2452 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2445 = var9.field2487[var2]; - var6.field2449 = var9.field2485[var2]; - var6.field2450 = var2; - var6.field2451 = var3 * var3 * var9.field2486[var2] * var9.field2488 + 1024 >> 11; - var6.field2457 = var9.field2482[var2] & 255; - var6.field2446 = (var2 << 8) - (var9.field2483[var2] & 32767); + 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.field2448 = 0; + var6.field2457 = 0; var6.field2458 = 0; var6.field2459 = -1; - var6.field2460 = 0; - if (this.field2432[var1] == 0) { - var6.stream = RawPcmStream.method2673(var8, this.method3788(var6), this.method3789(var6), this.method3790(var6)); + var6.field2448 = 0; + if (this.field2431[var1] == 0) { + var6.stream = RawPcmStream.method2685(var8, this.method3864(var6), this.method3818(var6), this.method3819(var6)); } else { - var6.stream = RawPcmStream.method2673(var8, this.method3788(var6), 0, this.method3790(var6)); - this.method3775(var6, var9.field2483[var2] < 0); + var6.stream = RawPcmStream.method2685(var8, this.method3864(var6), 0, this.method3819(var6)); + this.method3852(var6, var9.field2485[var2] < 0); } - if (var9.field2483[var2] < 0) { + if (var9.field2485[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2449 >= 0) { - MusicPatchNode var7 = this.field2436[var1][var6.field2449]; + if (var6.field2467 >= 0) { + MusicPatchNode var7 = this.field2435[var1][var6.field2467]; if (var7 != null && var7.field2459 < 0) { - this.field2435[var1][var7.field2450] = null; + this.field2441[var1][var7.field2464] = null; var7.field2459 = 0; } - this.field2436[var1][var6.field2449] = var6; + this.field2435[var1][var6.field2467] = var6; } this.patchStream.queue.addFirst(var6); - this.field2435[var1][var2] = var6; + this.field2441[var1][var2] = var6; } } } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lgu;ZI)V", - garbageValue = "-1328035462" + signature = "(Lhz;ZI)V", + garbageValue = "-1752723924" ) - void method3775(MusicPatchNode var1, boolean var2) { + void method3852(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field1379) { + if (var2 && var1.rawSound.field1407) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2432[var1.field2447] >> 6); + var4 = (int)((long)this.field2431[var1.field2452] * (long)var5 >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method2710(); + var1.stream.method2655(); } } else { - var4 = (int)((long)var3 * (long)this.field2432[var1.field2447] >> 6); + var4 = (int)((long)var3 * (long)this.field2431[var1.field2452] >> 6); } - var1.stream.method2622(var4); + var1.stream.method2664(var4); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-128" + signature = "(IIII)V", + garbageValue = "686121236" ) - void method3887(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2435[var1][var2]; + void method3805(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2441[var1][var2]; if (var4 != null) { - this.field2435[var1][var2] = null; - if ((this.field2429[var1] & 2) != 0) { + this.field2441[var1][var2] = null; + if ((this.field2428[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2447 == var4.field2447 && var5.field2459 < 0 && var4 != var5) { + if (var5.field2452 == var4.field2452 && var5.field2459 < 0 && var4 != var5) { var4.field2459 = 0; break; } @@ -482,50 +483,50 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-666904173" + garbageValue = "-97201691" ) - void method3777(int var1, int var2, int var3) { + void method3900(int var1, int var2, int var3) { } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-700125854" + garbageValue = "-1237765381" ) - void method3778(int var1, int var2) { - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1537654694" - ) - void method3779(int var1, int var2) { - this.field2426[var1] = var2; + void method3817(int var1, int var2) { } @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1595965237" + signature = "(III)V", + garbageValue = "288952234" ) - void method3780(int var1) { + void method3799(int var1, int var2) { + this.field2423[var1] = var2; + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "866447032" + ) + void method3809(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2447 == var1) { + if (var1 < 0 || var2.field2452 == var1) { if (var2.stream != null) { - var2.stream.method2619(PcmPlayer.field1398 / 100); - if (var2.stream.method2712()) { + var2.stream.method2706(PcmPlayer.field1421 / 100); + if (var2.stream.method2672()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3896(); + var2.method3917(); } if (var2.field2459 < 0) { - this.field2435[var2.field2447][var2.field2450] = null; + this.field2441[var2.field2452][var2.field2464] = null; } var2.remove(); @@ -534,78 +535,78 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1470820319" + garbageValue = "-1172399116" ) - void method3787(int var1) { + void method3810(int var1) { if (var1 >= 0) { - this.field2417[var1] = 12800; - this.field2421[var1] = 8192; - this.field2440[var1] = 16383; - this.field2426[var1] = 8192; - this.field2420[var1] = 0; - this.field2428[var1] = 8192; - this.method3784(var1); - this.method3785(var1); - this.field2429[var1] = 0; - this.field2437[var1] = 32767; - this.field2431[var1] = 256; - this.field2432[var1] = 0; - this.method3771(var1, 8192); + 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); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method3787(var1); + this.method3810(var1); } } } - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "112" + garbageValue = "-67" ) - void method3795(int var1) { + void method3840(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2447 == var1) && var2.field2459 < 0) { - this.field2435[var2.field2447][var2.field2450] = null; + if ((var1 < 0 || var2.field2452 == var1) && var2.field2459 < 0) { + this.field2441[var2.field2452][var2.field2464] = null; var2.field2459 = 0; } } } - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1072017255" + signature = "(B)V", + garbageValue = "86" ) - void method3878() { - this.method3780(-1); - this.method3787(-1); + void method3812() { + this.method3809(-1); + this.method3810(-1); int var1; for (var1 = 0; var1 < 16; ++var1) { - this.field2443[var1] = this.field2423[var1]; + this.field2421[var1] = this.field2420[var1]; } for (var1 = 0; var1 < 16; ++var1) { - this.field2418[var1] = this.field2423[var1] & -128; + this.field2422[var1] = this.field2420[var1] & -128; } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "131749797" + garbageValue = "-529276423" ) - void method3784(int var1) { - if ((this.field2429[var1] & 2) != 0) { + 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.field2447 == var1 && this.field2435[var1][var2.field2450] == null && var2.field2459 < 0) { + if (var2.field2452 == var1 && this.field2441[var1][var2.field2464] == null && var2.field2459 < 0) { var2.field2459 = 0; } } @@ -613,28 +614,28 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("an") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2050872328" + signature = "(IB)V", + garbageValue = "32" ) - void method3785(int var1) { - if ((this.field2429[var1] & 4) != 0) { + 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.field2447 == var1) { - var2.field2465 = 0; + if (var2.field2452 == var1) { + var2.field2462 = 0; } } } } - @ObfuscatedName("ai") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1369588293" + garbageValue = "1370441478" ) - void method3786(int var1) { + void method3815(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -643,235 +644,235 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3887(var3, var4, var5); + this.method3805(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3774(var3, var4, var5); + this.method3808(var3, var4, var5); } else { - this.method3887(var3, var4, 64); + this.method3805(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3777(var3, var4, var5); + this.method3900(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2418[var3] = (var5 << 14) + (this.field2418[var3] & -2080769); + this.field2422[var3] = (var5 << 14) + (this.field2422[var3] & -2080769); } if (var4 == 32) { - this.field2418[var3] = (var5 << 7) + (this.field2418[var3] & -16257); + this.field2422[var3] = (var5 << 7) + (this.field2422[var3] & -16257); } if (var4 == 1) { - this.field2420[var3] = (var5 << 7) + (this.field2420[var3] & -16257); + this.field2424[var3] = (var5 << 7) + (this.field2424[var3] & -16257); } if (var4 == 33) { - this.field2420[var3] = var5 + (this.field2420[var3] & -128); + this.field2424[var3] = var5 + (this.field2424[var3] & -128); } if (var4 == 5) { - this.field2428[var3] = (var5 << 7) + (this.field2428[var3] & -16257); + this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & -16257); } if (var4 == 37) { - this.field2428[var3] = var5 + (this.field2428[var3] & -128); + this.field2437[var3] = var5 + (this.field2437[var3] & -128); } if (var4 == 7) { - this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); + this.field2443[var3] = (var5 << 7) + (this.field2443[var3] & -16257); } if (var4 == 39) { - this.field2417[var3] = var5 + (this.field2417[var3] & -128); + this.field2443[var3] = var5 + (this.field2443[var3] & -128); } if (var4 == 10) { - this.field2421[var3] = (var5 << 7) + (this.field2421[var3] & -16257); + this.field2416[var3] = (var5 << 7) + (this.field2416[var3] & -16257); } if (var4 == 42) { - this.field2421[var3] = var5 + (this.field2421[var3] & -128); + this.field2416[var3] = var5 + (this.field2416[var3] & -128); } if (var4 == 11) { - this.field2440[var3] = (var5 << 7) + (this.field2440[var3] & -16257); + this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); } if (var4 == 43) { - this.field2440[var3] = var5 + (this.field2440[var3] & -128); + this.field2417[var3] = var5 + (this.field2417[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2429; + var10000 = this.field2428; var10000[var3] |= 1; } else { - var10000 = this.field2429; + var10000 = this.field2428; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2429; + var10000 = this.field2428; var10000[var3] |= 2; } else { - this.method3784(var3); - var10000 = this.field2429; + this.method3813(var3); + var10000 = this.field2428; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & 127); + this.field2429[var3] = (var5 << 7) + (this.field2429[var3] & 127); } if (var4 == 98) { - this.field2437[var3] = (this.field2437[var3] & 16256) + var5; + this.field2429[var3] = (this.field2429[var3] & 16256) + var5; } if (var4 == 101) { - this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & 127) + 16384; + this.field2429[var3] = (var5 << 7) + (this.field2429[var3] & 127) + 16384; } if (var4 == 100) { - this.field2437[var3] = (this.field2437[var3] & 16256) + var5 + 16384; + this.field2429[var3] = (this.field2429[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3780(var3); + this.method3809(var3); } if (var4 == 121) { - this.method3787(var3); + this.method3810(var3); } if (var4 == 123) { - this.method3795(var3); + this.method3840(var3); } int var6; if (var4 == 6) { - var6 = this.field2437[var3]; + var6 = this.field2429[var3]; if (var6 == 16384) { - this.field2431[var3] = (var5 << 7) + (this.field2431[var3] & -16257); + this.field2430[var3] = (var5 << 7) + (this.field2430[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2437[var3]; + var6 = this.field2429[var3]; if (var6 == 16384) { - this.field2431[var3] = var5 + (this.field2431[var3] & -128); + this.field2430[var3] = var5 + (this.field2430[var3] & -128); } } if (var4 == 16) { - this.field2432[var3] = (var5 << 7) + (this.field2432[var3] & -16257); + this.field2431[var3] = (var5 << 7) + (this.field2431[var3] & -16257); } if (var4 == 48) { - this.field2432[var3] = var5 + (this.field2432[var3] & -128); + this.field2431[var3] = var5 + (this.field2431[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2429; + var10000 = this.field2428; var10000[var3] |= 4; } else { - this.method3785(var3); - var10000 = this.field2429; + this.method3916(var3); + var10000 = this.field2428; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3771(var3, (var5 << 7) + (this.field2433[var3] & -16257)); + this.method3899(var3, (var5 << 7) + (this.field2432[var3] & -16257)); } if (var4 == 49) { - this.method3771(var3, var5 + (this.field2433[var3] & -128)); + this.method3899(var3, var5 + (this.field2432[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3773(var3, var4 + this.field2418[var3]); + this.method3802(var3, var4 + this.field2422[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3778(var3, var4); + this.method3817(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3779(var3, var4); + this.method3799(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method3878(); + this.method3812(); } } } - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "-26086" + signature = "(IIB)V", + garbageValue = "97" ) - void method3771(int var1, int var2) { - this.field2433[var1] = var2; - this.field2422[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + 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("ap") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Lgu;I)I", - garbageValue = "-1438350668" + signature = "(Lhz;I)I", + garbageValue = "-1438720370" ) - int method3788(MusicPatchNode var1) { - int var2 = (var1.field2455 * var1.field2454 >> 12) + var1.field2446; - var2 += (this.field2426[var1.field2447] - 8192) * this.field2431[var1.field2447] >> 12; - MusicPatchNode2 var3 = var1.field2445; + 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.field2405 > 0 && (var3.field2398 > 0 || this.field2420[var1.field2447] > 0)) { - var4 = var3.field2398 << 2; - int var5 = var3.field2406 << 1; + 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.field2420[var1.field2447] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2453 & 511)); - var2 += (int)(var6 * (double)var4); + 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.field1398 + 0.5D); + 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("ah") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Lgu;I)I", - garbageValue = "-1402395014" + signature = "(Lhz;I)I", + garbageValue = "-2023927212" ) - int method3789(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2445; - int var3 = this.field2440[var1.field2447] * this.field2417[var1.field2447] + 4096 >> 13; + int method3818(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2460; + int var3 = this.field2443[var1.field2452] * this.field2417[var1.field2452] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; var3 = var3 * var1.field2451 + 16384 >> 15; - var3 = var3 * this.field2434 + 128 >> 8; - if (var2.field2404 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2404 * (double)(var1.field2456 * 128) * 1.953125E-5D) + 0.5D); + 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); } int var4; @@ -879,24 +880,24 @@ public class MidiPcmStream extends PcmStream { int var6; int var7; if (var2.field2402 != null) { - var4 = var1.field2448; - var5 = var2.field2402[var1.field2458 * 4 + 1]; - if (var1.field2458 * 4 < var2.field2402.length - 2) { - var6 = (var2.field2402[var1.field2458 * 4] & 255) << 8; - var7 = (var2.field2402[var1.field2458 * 4 + 2] & 255) << 8; - var5 += (var2.field2402[var1.field2458 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + 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 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; } - if (var1.field2459 > 0 && var2.field2399 != null) { + if (var1.field2459 > 0 && var2.field2398 != null) { var4 = var1.field2459; - var5 = var2.field2399[var1.field2460 * 2 + 1]; - if (var1.field2460 * 2 < var2.field2399.length - 2) { - var6 = (var2.field2399[var1.field2460 * 2] & 255) << 8; - var7 = (var2.field2399[var1.field2460 * 2 + 2] & 255) << 8; - var5 += (var2.field2399[var1.field2460 * 2 + 3] - var5) * (var4 - var6) / (var7 - var6); + 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); } var3 = var5 * var3 + 32 >> 6; @@ -905,27 +906,27 @@ public class MidiPcmStream extends PcmStream { return var3; } - @ObfuscatedName("bq") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Lgu;I)I", - garbageValue = "1626929968" + signature = "(Lhz;I)I", + garbageValue = "1444946212" ) - int method3790(MusicPatchNode var1) { - int var2 = this.field2421[var1.field2447]; - return var2 < 8192 ? var2 * var1.field2457 + 32 >> 6 : 16384 - ((128 - var1.field2457) * (16384 - var2) + 32 >> 6); + 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); } - @ObfuscatedName("bf") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1319413335" + signature = "(B)V", + garbageValue = "-22" ) - void method3796() { + void method3825() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2442; var2 == this.trackLength; var3 = this.midiFile.method3917(var2)) { + for (var3 = this.field2425; var2 == this.trackLength; var3 = this.midiFile.method3935(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -933,8 +934,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2438 || var2 == 0) { - this.method3878(); + if (!this.field2418 || var2 == 0) { + this.method3812(); this.midiFile.clear(); return; } @@ -945,7 +946,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method3786(var5); + this.method3815(var5); } this.midiFile.readTrackLength(var1); @@ -958,20 +959,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2442 = var3; + this.field2425 = var3; } - @ObfuscatedName("bc") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(Lgu;B)Z", - garbageValue = "-27" + signature = "(Lhz;I)Z", + garbageValue = "-130954859" ) - boolean method3822(MusicPatchNode var1) { + boolean method3826(MusicPatchNode var1) { if (var1.stream == null) { if (var1.field2459 >= 0) { var1.remove(); - if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { - this.field2436[var1.field2447][var1.field2449] = null; + if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { + this.field2435[var1.field2452][var1.field2467] = null; } } @@ -981,17 +982,17 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("bk") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(Lgu;[IIIB)Z", - garbageValue = "12" + signature = "(Lhz;[IIIB)Z", + garbageValue = "0" ) - boolean method3848(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2464 = PcmPlayer.field1398 / 100; - if (var1.field2459 < 0 || var1.stream != null && !var1.stream.method2674()) { + 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; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2428[var1.field2447]) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2437[var1.field2452] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } @@ -999,82 +1000,82 @@ public class MidiPcmStream extends PcmStream { var1.field2455 = var5; } - var1.stream.method2660(this.method3788(var1)); - MusicPatchNode2 var6 = var1.field2445; + var1.stream.method2669(this.method3864(var1)); + MusicPatchNode2 var6 = var1.field2460; boolean var7 = false; ++var1.field2461; - var1.field2453 += var6.field2405; - double var8 = (double)((var1.field2450 - 60 << 8) + (var1.field2455 * var1.field2454 >> 12)) * 5.086263020833333E-6D; - if (var6.field2404 > 0) { - if (var6.field2403 > 0) { - var1.field2456 = var1.field2456 * -1540341760 + (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2403) + 0.5D) * 457728128; + 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); } else { - var1.field2456 = var1.field2456 * -1540341760 + -1540341760; + var1.field2456 += 128; } } if (var6.field2402 != null) { - if (var6.field2401 > 0) { - var1.field2448 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2401) + 0.5D); + if (var6.field2397 > 0) { + var1.field2457 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2397 * var8) + 0.5D); } else { - var1.field2448 += 128; + var1.field2457 += 128; } - while (var1.field2458 * 4 < var6.field2402.length - 2 && var1.field2448 > (var6.field2402[var1.field2458 * 4 + 2] & 255) << 8) { - var1.field2458 = var1.field2458 * 4 + 2; + while (var1.field2458 < var6.field2402.length - 2 && var1.field2457 > (var6.field2402[var1.field2458 + 2] & 255) << 8) { + var1.field2458 += 2; } - if (var1.field2458 * 4 == var6.field2402.length - 2 && var6.field2402[var1.field2458 * 4 + 1] == 0) { + if (var6.field2402.length - 2 == var1.field2458 && var6.field2402[var1.field2458 + 1] == 0) { var7 = true; } } - if (var1.field2459 >= 0 && var6.field2399 != null && (this.field2429[var1.field2447] & 1) == 0 && (var1.field2449 < 0 || var1 != this.field2436[var1.field2447][var1.field2449])) { + 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); } else { var1.field2459 += 128; } - while (var1.field2460 * 2 < var6.field2399.length - 2 && var1.field2459 > (var6.field2399[var1.field2460 * 2 + 2] & 255) << 8) { - var1.field2460 = var1.field2460 * 4 + 4; + while (var1.field2448 < var6.field2398.length - 2 && var1.field2459 > (var6.field2398[var1.field2448 + 2] & 255) << 8) { + var1.field2448 += 2; } - if (var1.field2460 * 2 == var6.field2399.length - 2) { + if (var6.field2398.length - 2 == var1.field2448) { var7 = true; } } if (var7) { - var1.stream.method2619(var1.field2464); + var1.stream.method2706(var1.field2453); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method2712()) { + if (var1.stream.method2672()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3896(); + var1.method3917(); if (var1.field2459 >= 0) { var1.remove(); - if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { - this.field2436[var1.field2447][var1.field2449] = null; + if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { + this.field2435[var1.field2452][var1.field2467] = null; } } return true; } else { - var1.stream.method2618(var1.field2464, this.method3789(var1), this.method3790(var1)); + var1.stream.method2704(var1.field2453, this.method3818(var1), this.method3819(var1)); return false; } } else { - var1.method3896(); + var1.method3917(); var1.remove(); - if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { - this.field2436[var1.field2447][var1.field2449] = null; + if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { + this.field2435[var1.field2452][var1.field2467] = null; } return true; diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 79153cf8c8..7914b89f91 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,176 +4,216 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fz") @Implements("MilliClock") public class MilliClock extends Clock { + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = -1060623823 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lcr;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("bf") + @Export("otp") + static String otp; + @ObfuscatedName("em") + @ObfuscatedGetter( + intValue = 119222289 + ) + static int field2026; @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "[Lme;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("b") - public static String field2015; - @ObfuscatedName("db") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("c") - long[] field2011; - @ObfuscatedName("t") + long[] field2028; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1924438695 + intValue = 370183015 ) - int field2009; - @ObfuscatedName("o") + int field2020; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 990081357 + intValue = -542018665 ) - int field2008; - @ObfuscatedName("e") + int field2021; + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 1282621302724329393L + longValue = 8140433523785303581L ) - long field2013; - @ObfuscatedName("i") + long field2019; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -552407369 + intValue = -1658910693 ) - int field2012; - @ObfuscatedName("g") + int field2023; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1470332853 + intValue = -371780323 ) - int field2014; + int field2024; MilliClock() { - this.field2011 = new long[10]; - this.field2009 = 256; - this.field2008 = 1; - this.field2012 = 0; - this.field2013 = WorldMapIcon_0.currentTimeMillis(); + this.field2028 = new long[10]; + this.field2020 = 256; + this.field2021 = 1; + this.field2023 = 0; + this.field2019 = class217.currentTimeMillis(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2011[var1] = this.field2013; + this.field2028[var1] = this.field2019; } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "-1351231250" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2011[var1] = 0L; + this.field2028[var1] = 0L; } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-561232674" + garbageValue = "-1723558008" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field2009; - int var4 = this.field2008; - this.field2009 = 300; - this.field2008 = 1; - this.field2013 = WorldMapIcon_0.currentTimeMillis(); - if (this.field2011[this.field2014] == 0L) { - this.field2009 = var3; - this.field2008 = var4; - } else if (this.field2013 > this.field2011[this.field2014]) { - this.field2009 = (int)((long)(var1 * 2560) / (this.field2013 - this.field2011[this.field2014])); + 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])); } - if (this.field2009 < 25) { - this.field2009 = 25; + if (this.field2020 < 25) { + this.field2020 = 25; } - if (this.field2009 > 256) { - this.field2009 = 256; - this.field2008 = (int)((long)var1 - (this.field2013 - this.field2011[this.field2014]) / 10L); + if (this.field2020 > 256) { + this.field2020 = 256; + this.field2021 = (int)((long)var1 - (this.field2019 - this.field2028[this.field2024]) / 10L); } - if (this.field2008 > var1) { - this.field2008 = var1; + if (this.field2021 > var1) { + this.field2021 = var1; } - this.field2011[this.field2014] = this.field2013; - this.field2014 = (this.field2014 + 1) % 10; + this.field2028[this.field2024] = this.field2019; + this.field2024 = (this.field2024 + 1) % 10; int var5; - if (this.field2008 > 1) { + if (this.field2021 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field2011[var5]) { - this.field2011[var5] += (long)this.field2008; + if (this.field2028[var5] != 0L) { + this.field2028[var5] += (long)this.field2021; } } } - if (this.field2008 < var2) { - this.field2008 = var2; + if (this.field2021 < var2) { + this.field2021 = var2; } - FriendLoginUpdate.method5325((long)this.field2008); + class169.method3541((long)this.field2021); - for (var5 = 0; this.field2012 < 256; this.field2012 += this.field2009) { + for (var5 = 0; this.field2023 < 256; this.field2023 += this.field2020) { ++var5; } - this.field2012 &= 255; + this.field2023 &= 255; return var5; } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(III)Lce;", - garbageValue = "-230494464" + signature = "(II)Z", + garbageValue = "-985572869" ) - static Script method3529(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 = archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; + public static boolean method3560(int var0) { + return (var0 >> 29 & 1) != 0; + } + + @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; } - var2 = Clock.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; + 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 (LoginScreenAnimation.loadInterface(var5)) { + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); + } } } - return null; + 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); + } + } } } - } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1997111110" - ) - public static void method3535() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 4e975675b8..3970e882bc 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("dx") +@ObfuscatedName("el") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lel;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lel;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ar") - static boolean[] field1673; + @ObfuscatedName("aq") + static boolean[] field1721; @ObfuscatedName("av") - static boolean[] field1696; - @ObfuscatedName("al") + static boolean[] field1722; + @ObfuscatedName("ak") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("am") - static int[] field1699; - @ObfuscatedName("ao") - static int[] field1700; - @ObfuscatedName("at") - static int[] field1701; - @ObfuscatedName("an") - static int[] field1693; - @ObfuscatedName("ai") - static int[] field1704; - @ObfuscatedName("ab") - static int[][] field1722; - @ObfuscatedName("ap") - static int[] field1670; + @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[][] field1707; - @ObfuscatedName("bq") - static int[] field1708; + static int[][] field1731; + @ObfuscatedName("ag") + static int[] field1736; + @ObfuscatedName("aw") + static int[][] field1727; @ObfuscatedName("bf") - static int[] field1709; + static int[] field1734; @ObfuscatedName("bc") - static int[] field1684; + static int[] field1735; + @ObfuscatedName("bo") + static int[] field1733; + @ObfuscatedName("bd") + static int[] field1696; @ObfuscatedName("bk") - static int[] field1711; - @ObfuscatedName("bb") - static int[] field1712; - @ObfuscatedName("bi") - static int[] field1719; - @ObfuscatedName("bp") + static int[] field1692; + @ObfuscatedName("bu") + static int[] field1739; + @ObfuscatedName("be") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("by") + @ObfuscatedName("bt") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("be") - static boolean field1717; - @ObfuscatedName("bn") + @ObfuscatedName("bh") + static boolean field1743; + @ObfuscatedName("ba") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bm") + @ObfuscatedName("bv") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("ba") - static int[] field1713; - @ObfuscatedName("bd") - static int[] field1723; - @ObfuscatedName("i") + @ObfuscatedName("bx") + static int[] field1748; + @ObfuscatedName("bz") + static int[] field1749; + @ObfuscatedName("w") @Export("verticesCount") int verticesCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("verticesX") int[] verticesX; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("verticesY") int[] verticesY; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("indicesCount") int indicesCount; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("indices1") int[] indices1; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("indices2") int[] indices2; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("indices3") int[] indices3; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("q") - byte[] field1686; - @ObfuscatedName("z") + @ObfuscatedName("a") + byte[] field1699; + @ObfuscatedName("b") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("y") - byte field1675; - @ObfuscatedName("f") - int field1676; - @ObfuscatedName("b") - int[] field1677; + @ObfuscatedName("l") + byte field1701; @ObfuscatedName("r") - int[] field1678; - @ObfuscatedName("s") - int[] field1656; - @ObfuscatedName("a") + int field1698; + @ObfuscatedName("o") + int[] field1685; + @ObfuscatedName("c") + int[] field1704; + @ObfuscatedName("j") + int[] field1705; + @ObfuscatedName("y") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; @ObfuscatedName("ae") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("boundsType") int boundsType; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("bottomY") int bottomY; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("xzRadius") int xzRadius; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("diameter") int diameter; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("radius") int radius; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("xMid") int xMid; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("yMid") int yMid; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("zMid") int zMid; @ObfuscatedName("as") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ac") + @ObfuscatedName("au") @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]; - field1673 = new boolean[4700]; - field1696 = new boolean[4700]; + field1721 = new boolean[4700]; + field1722 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1699 = new int[4700]; - field1700 = new int[4700]; - field1701 = new int[4700]; - field1693 = new int[4700]; - field1704 = new int[1600]; - field1722 = new int[1600][512]; - field1670 = new int[12]; - field1707 = new int[12][2000]; - field1708 = new int[2000]; - field1709 = new int[2000]; - field1684 = new int[12]; - field1711 = new int[10]; - field1712 = new int[10]; - field1719 = new int[10]; - field1717 = true; + 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; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1713 = Rasterizer3D.Rasterizer3D_colorPalette; - field1723 = Rasterizer3D.field1778; + field1748 = Rasterizer3D.Rasterizer3D_colorPalette; + field1749 = Rasterizer3D.field1793; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1675 = 0; - this.field1676 = 0; + this.field1701 = 0; + this.field1698 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Ldx;I)V" + signature = "([Lel;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field1675 = 0; - this.field1676 = 0; + this.field1701 = 0; + this.field1698 = 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.field1676 = 0; - this.field1675 = -1; + this.field1698 = 0; + this.field1701 = -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.field1676 += var8.field1676; + this.field1698 += var8.field1698; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field1675 == -1) { - this.field1675 = var8.field1675; + if (this.field1701 == -1) { + this.field1701 = var8.field1701; } - if (this.field1675 != var8.field1675) { + if (this.field1701 != var8.field1701) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1686 != null; + var6 |= var8.field1699 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1686 = new byte[this.indicesCount]; + this.field1699 = new byte[this.indicesCount]; } - if (this.field1676 > 0) { - this.field1677 = new int[this.field1676]; - this.field1678 = new int[this.field1676]; - this.field1656 = new int[this.field1676]; + if (this.field1698 > 0) { + this.field1685 = new int[this.field1698]; + this.field1704 = new int[this.field1698]; + this.field1705 = new int[this.field1698]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1676 = 0; + this.field1698 = 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.field1675; + this.faceRenderPriorities[this.indicesCount] = var8.field1701; } } @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1686 != null && var8.field1686[var9] != -1) { - this.field1686[this.indicesCount] = (byte)(this.field1676 + var8.field1686[var9]); + if (var8.field1699 != null && var8.field1699[var9] != -1) { + this.field1699[this.indicesCount] = (byte)(this.field1698 + var8.field1699[var9]); } else { - this.field1686[this.indicesCount] = -1; + this.field1699[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1676; ++var9) { - this.field1677[this.field1676] = this.verticesCount + var8.field1677[var9]; - this.field1678[this.field1676] = this.verticesCount + var8.field1678[var9]; - this.field1656[this.field1676] = this.verticesCount + var8.field1656[var9]; - ++this.field1676; + 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.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldx;" + signature = "([[IIIIZI)Lel;" ) @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.field1676 = this.field1676; + var11.field1698 = this.field1698; 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.field1686 = this.field1686; + var11.field1699 = this.field1699; var11.faceTextures = this.faceTextures; - var11.field1675 = this.field1675; - var11.field1677 = this.field1677; - var11.field1678 = this.field1678; - var11.field1656 = this.field1656; + var11.field1701 = this.field1701; + var11.field1685 = this.field1685; + var11.field1704 = this.field1704; + var11.field1705 = this.field1705; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Entity { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Z)Ldx;" + signature = "(Z)Lel;" ) @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("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Z)Ldx;" + signature = "(Z)Lel;" ) @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("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(ZLdx;[B)Ldx;" + signature = "(ZLel;[B)Lel;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1676 = this.field1676; + var2.field1698 = this.field1698; 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.field1686 = this.field1686; + var2.field1699 = this.field1699; var2.faceTextures = this.faceTextures; - var2.field1675 = this.field1675; - var2.field1677 = this.field1677; - var2.field1678 = this.field1678; - var2.field1656 = this.field1656; + var2.field1701 = this.field1701; + var2.field1685 = this.field1685; + var2.field1704 = this.field1704; + var2.field1705 = this.field1705; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("i") + @ObfuscatedName("w") @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.method3083(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method3113(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3084(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method3150(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Entity { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,8 +641,8 @@ public class Model extends Entity { } } - @ObfuscatedName("d") - void method2950() { + @ObfuscatedName("q") + void method2998() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -663,22 +663,22 @@ public class Model extends Entity { } } - @ObfuscatedName("l") - public int method2952() { + @ObfuscatedName("z") + public int method2993() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Les;I)V" + signature = "(Lef;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Entity { } } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Les;ILes;I[I)V" + signature = "(Lef;ILef;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("v") + @ObfuscatedName("n") @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("n") + @ObfuscatedName("u") @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("x") + @ObfuscatedName("h") @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("w") + @ObfuscatedName("g") @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("q") + @ObfuscatedName("i") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -970,7 +970,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("z") + @ObfuscatedName("a") @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("y") + @ObfuscatedName("o") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -997,11 +997,11 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("f") - public final void method2946(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1704[0] = -1; + @ObfuscatedName("c") + public final void method2982(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1737[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2950(); + this.method2998(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1044,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1699[var19] = var22 - var18; + field1703[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1676 > 0) { - field1700[var19] = var20; - field1701[var19] = var23; - field1693[var19] = var22; + if (this.field1698 > 0) { + field1726[var19] = var20; + field1707[var19] = var23; + field1728[var19] = var22; } } @@ -1061,11 +1061,11 @@ public class Model extends Entity { } - @ObfuscatedName("a") - public final void method2938(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1704[0] = -1; + @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; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2950(); + this.method2998(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1108,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1699[var20] = var23 - var19; + field1703[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1676 > 0) { - field1700[var20] = var21; - field1701[var20] = var24; - field1693[var20] = var23; + if (this.field1698 > 0) { + field1726[var20] = var21; + field1707[var20] = var24; + field1728[var20] = var23; } } @@ -1125,19 +1125,20 @@ public class Model extends Entity { } - @ObfuscatedName("u") + @ObfuscatedName("ae") @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) { - field1704[var6] = 0; + field1737[var6] = 0; } var6 = var3 ? 20 : 5; int var7; int var8; + int var9; int var10; int var11; int var12; @@ -1145,202 +1146,230 @@ 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]; - var27 = this.indices2[var7]; + var9 = this.indices2[var7]; var10 = this.indices3[var7]; var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var27]; + var12 = modelViewportXs[var9]; var13 = modelViewportXs[var10]; - int var28; - if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2 && TextureProvider.method2811(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - field1696[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1673[var7] = false; - } else { - field1673[var7] = true; - } - - var28 = (field1699[var8] + field1699[var27] + field1699[var10]) / 3 + this.radius; - field1722[var28][field1704[var28]++] = var7; - } - } else { - var28 = field1700[var8]; - var15 = field1700[var27]; - var16 = field1700[var10]; - int var17 = field1701[var8]; - var18 = field1701[var27]; - int var19 = field1701[var10]; - int var20 = field1693[var8]; - int var21 = field1693[var27]; - int var22 = field1693[var10]; - var28 -= var15; + 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; var16 -= var15; var17 -= var18; var19 -= var18; var20 -= var21; var22 -= var21; int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var28 * var22; - int var25 = var28 * var19 - var17 * var16; + int var24 = var20 * var16 - var34 * var22; + int var25 = var34 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1696[var7] = true; - int var26 = (field1699[var8] + field1699[var27] + field1699[var10]) / 3 + this.radius; - field1722[var26][field1704[var26]++] = var7; + 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; } } } } - int[] var9; + int[] var27; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1704[var7]; + var8 = field1737[var7]; if (var8 > 0) { - var9 = field1722[var7]; + var27 = field1731[var7]; for (var10 = 0; var10 < var8; ++var10) { - this.method2992(var9[var10]); + this.method2986(var27[var10]); } } } } else { for (var7 = 0; var7 < 12; ++var7) { - field1670[var7] = 0; - field1684[var7] = 0; + field1736[var7] = 0; + field1733[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1704[var7]; + var8 = field1737[var7]; if (var8 > 0) { - var9 = field1722[var7]; + var27 = field1731[var7]; for (var10 = 0; var10 < var8; ++var10) { - var11 = var9[var10]; - byte var32 = this.faceRenderPriorities[var11]; - var13 = field1670[var32]++; - field1707[var32][var13] = var11; - if (var32 < 10) { - int[] var10000 = field1684; - var10000[var32] += var7; - } else if (var32 == 10) { - field1708[var13] = var7; + 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; } else { - field1709[var13] = var7; + field1735[var13] = var7; } } } } var7 = 0; - if (field1670[1] > 0 || field1670[2] > 0) { - var7 = (field1684[1] + field1684[2]) / (field1670[1] + field1670[2]); + if (field1736[1] > 0 || field1736[2] > 0) { + var7 = (field1733[1] + field1733[2]) / (field1736[1] + field1736[2]); } var8 = 0; - if (field1670[3] > 0 || field1670[4] > 0) { - var8 = (field1684[3] + field1684[4]) / (field1670[3] + field1670[4]); + if (field1736[3] > 0 || field1736[4] > 0) { + var8 = (field1733[3] + field1733[4]) / (field1736[3] + field1736[4]); } - var27 = 0; - if (field1670[6] > 0 || field1670[8] > 0) { - var27 = (field1684[8] + field1684[6]) / (field1670[8] + field1670[6]); + var9 = 0; + if (field1736[6] > 0 || field1736[8] > 0) { + var9 = (field1733[8] + field1733[6]) / (field1736[8] + field1736[6]); } var11 = 0; - var12 = field1670[10]; - int[] var29 = field1707[10]; - int[] var30 = field1708; + var12 = field1736[10]; + int[] var30 = field1727[10]; + int[] var31 = field1734; if (var11 == var12) { var11 = 0; - var12 = field1670[11]; - var29 = field1707[11]; - var30 = field1709; + var12 = field1736[11]; + var30 = field1727[11]; + var31 = field1735; } if (var11 < var12) { - var10 = var30[var11]; + var10 = var31[var11]; } else { var10 = -1000; } for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { - this.method2992(var29[var11++]); - if (var11 == var12 && var29 != field1707[11]) { + this.method2986(var30[var11++]); + if (var11 == var12 && var30 != field1727[11]) { var11 = 0; - var12 = field1670[11]; - var29 = field1707[11]; - var30 = field1709; + var12 = field1736[11]; + var30 = field1727[11]; + var31 = field1735; } if (var11 < var12) { - var10 = var30[var11]; + var10 = var31[var11]; } else { var10 = -1000; } } while (var15 == 3 && var10 > var8) { - this.method2992(var29[var11++]); - if (var11 == var12 && var29 != field1707[11]) { + this.method2986(var30[var11++]); + if (var11 == var12 && var30 != field1727[11]) { var11 = 0; - var12 = field1670[11]; - var29 = field1707[11]; - var30 = field1709; + var12 = field1736[11]; + var30 = field1727[11]; + var31 = field1735; } if (var11 < var12) { - var10 = var30[var11]; + var10 = var31[var11]; } else { var10 = -1000; } } - while (var15 == 5 && var10 > var27) { - this.method2992(var29[var11++]); - if (var11 == var12 && var29 != field1707[11]) { + while (var15 == 5 && var10 > var9) { + this.method2986(var30[var11++]); + if (var11 == var12 && var30 != field1727[11]) { var11 = 0; - var12 = field1670[11]; - var29 = field1707[11]; - var30 = field1709; + var12 = field1736[11]; + var30 = field1727[11]; + var31 = field1735; } if (var11 < var12) { - var10 = var30[var11]; + var10 = var31[var11]; } else { var10 = -1000; } } - var16 = field1670[var15]; - int[] var31 = field1707[var15]; + var16 = field1736[var15]; + int[] var32 = field1727[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.method2992(var31[var18]); + this.method2986(var32[var18]); } } while (var10 != -1000) { - this.method2992(var29[var11++]); - if (var11 == var12 && var29 != field1707[11]) { + this.method2986(var30[var11++]); + if (var11 == var12 && var30 != field1727[11]) { var11 = 0; - var29 = field1707[11]; - var12 = field1670[11]; - var30 = field1709; + var30 = field1727[11]; + var12 = field1736[11]; + var31 = field1735; } if (var11 < var12) { - var10 = var30[var11]; + var10 = var31[var11]; } else { var10 = -1000; } @@ -1350,15 +1379,15 @@ public class Model extends Entity { } } - @ObfuscatedName("ae") - final void method2992(int var1) { - if (field1696[var1]) { - this.method2988(var1); + @ObfuscatedName("an") + final void method2986(int var1) { + if (field1722[var1]) { + this.method3029(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1761 = field1673[var1]; + Rasterizer3D.field1778 = field1721[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1369,11 +1398,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1686 != null && this.field1686[var1] != -1) { - int var8 = this.field1686[var1] & 255; - var5 = this.field1677[var8]; - var6 = this.field1678[var8]; - var7 = this.field1656[var8]; + 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]; } else { var5 = var2; var6 = var3; @@ -1381,30 +1410,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3078(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var5], field1700[var6], field1700[var7], field1701[var5], field1701[var6], field1701[var7], field1693[var5], field1693[var6], field1693[var7], this.faceTextures[var1]); + 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]); } else { - Rasterizer3D.method3078(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1700[var5], field1700[var6], field1700[var7], field1701[var5], field1701[var6], field1701[var7], field1693[var5], field1693[var6], field1693[var7], this.faceTextures[var1]); + 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]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3123(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1713[this.faceColors1[var1]]); + Rasterizer3D.method3107(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1748[this.faceColors1[var1]]); } else { - Rasterizer3D.method3116(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method3105(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("af") - final void method2988(int var1) { + @ObfuscatedName("ai") + final void method3029(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 = field1693[var5]; - int var9 = field1693[var6]; - int var10 = field1693[var7]; + int var8 = field1728[var5]; + int var9 = field1728[var6]; + int var10 = field1728[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1416,96 +1445,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1711[var4] = modelViewportXs[var5]; - field1712[var4] = modelViewportYs[var5]; - field1719[var4++] = this.faceColors1[var1]; + field1696[var4] = modelViewportXs[var5]; + field1692[var4] = modelViewportYs[var5]; + field1739[var4++] = this.faceColors1[var1]; } else { - var11 = field1700[var5]; - var12 = field1701[var5]; + var11 = field1726[var5]; + var12 = field1707[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1723[var10 - var8] * (50 - var8); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var7] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var7] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + 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); } if (var9 >= 50) { - var14 = field1723[var9 - var8] * (50 - var8); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var6] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var6] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + 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); } } if (var9 >= 50) { - field1711[var4] = modelViewportXs[var6]; - field1712[var4] = modelViewportYs[var6]; - field1719[var4++] = this.faceColors2[var1]; + field1696[var4] = modelViewportXs[var6]; + field1692[var4] = modelViewportYs[var6]; + field1739[var4++] = this.faceColors2[var1]; } else { - var11 = field1700[var6]; - var12 = field1701[var6]; + var11 = field1726[var6]; + var12 = field1707[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1723[var8 - var9] * (50 - var9); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var5] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var5] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + 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); } if (var10 >= 50) { - var14 = field1723[var10 - var9] * (50 - var9); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var7] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var7] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + 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); } } if (var10 >= 50) { - field1711[var4] = modelViewportXs[var7]; - field1712[var4] = modelViewportYs[var7]; - field1719[var4++] = this.faceColors3[var1]; + field1696[var4] = modelViewportXs[var7]; + field1692[var4] = modelViewportYs[var7]; + field1739[var4++] = this.faceColors3[var1]; } else { - var11 = field1700[var7]; - var12 = field1701[var7]; + var11 = field1726[var7]; + var12 = field1707[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1723[var9 - var10] * (50 - var10); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var6] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var6] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + 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); } if (var8 >= 50) { - var14 = field1723[var8 - var10] * (50 - var10); - field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var5] - var11) * var14 >> 16)) / 50; - field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var5] - var12) * var14 >> 16)) / 50; - field1719[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + 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); } } - var11 = field1711[0]; - var12 = field1711[1]; - var13 = field1711[2]; - var14 = field1712[0]; - int var15 = field1712[1]; - int var16 = field1712[2]; - Rasterizer3D.field1761 = false; + var11 = field1696[0]; + var12 = field1696[1]; + var13 = field1696[2]; + var14 = field1692[0]; + int var15 = field1692[1]; + int var16 = field1692[2]; + Rasterizer3D.field1778 = 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.field1761 = true; + Rasterizer3D.field1778 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1686 != null && this.field1686[var1] != -1) { - var20 = this.field1686[var1] & 255; - var17 = this.field1677[var20]; - var18 = this.field1678[var20]; - var19 = this.field1656[var20]; + 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]; } else { var17 = var5; var18 = var6; @@ -1513,28 +1542,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], this.faceTextures[var1]); + 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]); } else { - Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], this.faceTextures[var1]); + 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]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3123(var14, var15, var16, var11, var12, var13, field1713[this.faceColors1[var1]]); + Rasterizer3D.method3107(var14, var15, var16, var11, var12, var13, field1748[this.faceColors1[var1]]); } else { - Rasterizer3D.method3116(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2]); + Rasterizer3D.method3105(var14, var15, var16, var11, var12, var13, field1739[0], field1739[1], field1739[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1711[3] < 0 || field1711[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1761 = true; + 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 (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1686 != null && this.field1686[var1] != -1) { - var20 = this.field1686[var1] & 255; - var17 = this.field1677[var20]; - var18 = this.field1678[var20]; - var19 = this.field1656[var20]; + 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]; } else { var17 = var5; var18 = var6; @@ -1543,28 +1572,28 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); - Rasterizer3D.method3078(var14, var16, field1712[3], var11, var13, field1711[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); + 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); } else { - Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); - Rasterizer3D.method3078(var14, var16, field1712[3], var11, var13, field1711[3], field1719[0], field1719[2], field1719[3], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); + 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); } } else if (this.faceColors3[var1] == -1) { - var17 = field1713[this.faceColors1[var1]]; - Rasterizer3D.method3123(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3123(var14, var16, field1712[3], var11, var13, field1711[3], var17); + 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); } else { - Rasterizer3D.method3116(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2]); - Rasterizer3D.method3116(var14, var16, field1712[3], var11, var13, field1711[3], field1719[0], field1719[2], field1719[3]); + 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]); } } } - @ObfuscatedName("cn") + @ObfuscatedName("cq") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1704[0] = -1; + field1737[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1594,139 +1623,104 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1676 > 0; - int var27 = MusicPatchNode.method3903(); + boolean var26 = var25 || this.field1698 > 0; + int var27 = class52.method905(); int var28 = ViewportMouse.ViewportMouse_y; - boolean var30 = Decimator.method2601(); - boolean var31 = KeyHandler.method850(var9); - boolean var32 = false; + boolean var30 = ViewportMouse.ViewportMouse_isInViewport; + boolean var32 = Decimator.method2635(var9); + boolean var33 = false; + int var35; int var36; int var37; - int var38; - int var39; - int var40; - int var41; - int var45; - int var49; - if (var31 && var30) { - boolean var33 = false; - if (field1717) { - boolean var34; - if (!Decimator.method2601()) { - var34 = false; - } else { - MouseRecorder.method1209(); - var36 = this.xMid + var6; - var37 = var7 + this.yMid; - var38 = var8 + this.zMid; - var39 = this.xMidOffset; - var40 = this.yMidOffset; - var41 = this.zMidOffset; - int var42 = ViewportMouse.field1729 - var36; - int var43 = ViewportMouse.field1731 - var37; - int var44 = ViewportMouse.field1736 - var38; - if (Math.abs(var42) > var39 + UserComparator7.field1978) { - var34 = false; - } else if (Math.abs(var43) > var40 + class4.field26) { - var34 = false; - } else if (Math.abs(var44) > var41 + class43.field381) { - var34 = false; - } else if (Math.abs(var44 * ViewportMouse.field1733 - var43 * ViewportMouse.field1742) > var40 * class43.field381 + var41 * class4.field26) { - var34 = false; - } else if (Math.abs(var42 * ViewportMouse.field1742 - var44 * TextureProvider.field1512) > var41 * UserComparator7.field1978 + var39 * class43.field381) { - var34 = false; - } else if (Math.abs(var43 * TextureProvider.field1512 - var42 * ViewportMouse.field1733) > var39 * class4.field26 + var40 * UserComparator7.field1978) { - var34 = false; - } else { - var34 = true; - } - } - - var33 = var34; + if (var32 && var30) { + boolean var34 = false; + if (field1743) { + var34 = SecureRandomCallable.method1252(this, var6, var7, var8); } else { - var49 = var12 - var13; - if (var49 <= 50) { - var49 = 50; + var35 = var12 - var13; + if (var35 <= 50) { + var35 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var49; + var17 /= var35; } else { var17 /= var14; - var16 /= var49; + var16 /= var35; } if (var18 > 0) { var22 /= var14; - var20 /= var49; + var20 /= var35; } else { var20 /= var14; - var22 /= var49; + var22 /= var35; } - var45 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var45 > var16 && var45 < var17 && var36 > var22 && var36 < var20) { + var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var37 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { + var34 = true; + } + } + + if (var34) { + if (this.isSingleTile) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + } else { var33 = true; } } - - if (var33) { - if (this.isSingleTile) { - UserComparator9.method3460(var9); - } else { - var32 = true; - } - } } - int var48 = Rasterizer3D.Rasterizer3D_clipMidX; - var49 = Rasterizer3D.Rasterizer3D_clipMidY; - var45 = 0; + int var47 = Rasterizer3D.Rasterizer3D_clipMidX; + var35 = Rasterizer3D.Rasterizer3D_clipMidY; var36 = 0; + var37 = 0; if (var1 != 0) { - var45 = Model_sine[var1]; - var36 = Model_cosine[var1]; + var36 = Model_sine[var1]; + var37 = Model_cosine[var1]; } - for (var37 = 0; var37 < this.verticesCount; ++var37) { - var38 = this.verticesX[var37]; - var39 = this.verticesY[var37]; - var40 = this.verticesZ[var37]; + for (int var38 = 0; var38 < this.verticesCount; ++var38) { + int var39 = this.verticesX[var38]; + int var40 = this.verticesY[var38]; + int var41 = this.verticesZ[var38]; + int var42; if (var1 != 0) { - var41 = var40 * var45 + var38 * var36 >> 16; - var40 = var40 * var36 - var38 * var45 >> 16; - var38 = var41; + var42 = var41 * var36 + var39 * var37 >> 16; + var41 = var41 * var37 - var39 * var36 >> 16; + var39 = var42; } - var38 += var6; - var39 += var7; - var40 += var8; - var41 = var40 * var4 + var5 * var38 >> 16; - var40 = var5 * var40 - var38 * var4 >> 16; - var38 = var41; - var41 = var3 * var39 - var40 * var2 >> 16; - var40 = var39 * var2 + var3 * var40 >> 16; - field1699[var37] = var40 - var12; - if (var40 >= 50) { - modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var40 + var48; - modelViewportYs[var37] = var41 * Rasterizer3D.Rasterizer3D_zoom / var40 + var49; + var39 += var6; + var40 += var7; + var41 += var8; + var42 = var41 * var4 + var5 * var39 >> 16; + var41 = var5 * var41 - var39 * var4 >> 16; + var39 = var42; + var42 = var3 * var40 - var41 * var2 >> 16; + var41 = var40 * var2 + var3 * var41 >> 16; + field1703[var38] = var41 - var12; + if (var41 >= 50) { + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; } else { - modelViewportXs[var37] = -5000; + modelViewportXs[var38] = -5000; var24 = true; } if (var26) { - field1700[var37] = var38; - field1701[var37] = var41; - field1693[var37] = var40; + field1726[var38] = var39; + field1707[var38] = var42; + field1728[var38] = var41; } } try { - this.draw0(var24, var32, this.isSingleTile, var9); - } catch (Exception var47) { + this.draw0(var24, var33, this.isSingleTile, var9); + } catch (Exception var46) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index f676a41146..9fa8466bad 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("dg") +@ObfuscatedName("ea") @Implements("ModelData") public class ModelData extends Entity { @ObfuscatedName("as") - static int[] field1559; - @ObfuscatedName("ak") - static int[] field1547; - @ObfuscatedName("ac") - static int field1571; - @ObfuscatedName("aw") + static int[] field1576; + @ObfuscatedName("am") + static int[] field1601; + @ObfuscatedName("au") + static int field1588; + @ObfuscatedName("ao") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("verticesCount") int verticesCount; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("verticesX") int[] verticesX; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("verticesY") int[] verticesY; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("faceCount") int faceCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("indices1") int[] indices1; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("indices2") int[] indices2; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("indices3") int[] indices3; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("faceColors") short[] faceColors; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("priority") byte priority; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Let;" + signature = "[Ler;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Ldp;" + signature = "[Len;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "[Ldp;" + signature = "[Len;" ) - VertexNormal[] field1561; - @ObfuscatedName("af") + VertexNormal[] field1591; + @ObfuscatedName("an") @Export("ambient") public short ambient; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("contrast") public short contrast; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("aj") - int field1563; - @ObfuscatedName("au") - int field1570; - @ObfuscatedName("ay") + @ObfuscatedName("ab") int field1567; - @ObfuscatedName("aa") - int field1537; - @ObfuscatedName("aq") - int field1569; + @ObfuscatedName("ar") + int field1595; + @ObfuscatedName("af") + int field1597; + @ObfuscatedName("at") + int field1594; + @ObfuscatedName("al") + int field1599; static { - field1559 = new int[10000]; - field1547 = new int[10000]; - field1571 = 0; + field1576 = new int[10000]; + field1601 = new int[10000]; + field1588 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Ldg;I)V" + signature = "([Lea;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.method2847(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2847(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2847(var10, var10.indices3[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.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.method2847(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2847(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2847(var10, var10.texTriangleZ[var11]); + 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.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.method2840(var1); + this.method2894(var1); } else { - this.method2841(var1); + this.method2882(var1); } } @ObfuscatedSignature( - signature = "(Ldg;ZZZZ)V", + signature = "(Lea;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.field1561 = var1.field1561; + this.field1591 = var1.field1591; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("t") - void method2840(byte[] var1) { + @ObfuscatedName("m") + void method2894(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("o") - void method2841(byte[] var1) { + @ObfuscatedName("k") + void method2882(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ldg;I)I" + signature = "(Lea;I)I" ) - final int method2847(ModelData var1, int var2) { + final int method2884(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("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Ldg;" + signature = "()Lea;" ) - public ModelData method2845() { + public ModelData method2885() { 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("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldg;" + signature = "([[IIIIZI)Lea;" ) - public ModelData method2838(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2886(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1570; - int var8 = var2 + this.field1567; - int var9 = var4 + this.field1569; - int var10 = var4 + this.field1537; + int var7 = var2 + this.field1595; + int var8 = var2 + this.field1597; + int var9 = var4 + this.field1599; + int var10 = var4 + this.field1594; 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("d") - void method2846() { + @ObfuscatedName("q") + void method2901() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("l") - public void method2862() { + @ObfuscatedName("z") + public void method2888() { 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("m") - public void method2848() { + @ObfuscatedName("e") + public void method2889() { 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("p") - public void method2903() { + @ObfuscatedName("s") + public void method2910() { 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("h") - public void method2850(int var1) { + @ObfuscatedName("p") + public void method2891(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("v") + @ObfuscatedName("n") @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("n") + @ObfuscatedName("u") @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("x") + @ObfuscatedName("h") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1278,8 +1278,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("w") - public void method2854() { + @ObfuscatedName("g") + public void method2895() { 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("q") + @ObfuscatedName("i") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1306,7 +1306,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("z") + @ObfuscatedName("a") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -1382,52 +1382,52 @@ public class ModelData extends Entity { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1561 = null; + this.field1591 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1563 = 0; - this.field1570 = 999999; - this.field1567 = -999999; - this.field1537 = -99999; - this.field1569 = 99999; + this.field1567 = 0; + this.field1595 = 999999; + this.field1597 = -999999; + this.field1594 = -99999; + this.field1599 = 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.field1570) { - this.field1570 = var2; + if (var2 < this.field1595) { + this.field1595 = var2; } - if (var2 > this.field1567) { - this.field1567 = var2; + if (var2 > this.field1597) { + this.field1597 = var2; } - if (var4 < this.field1569) { - this.field1569 = var4; + if (var4 < this.field1599) { + this.field1599 = var4; } - if (var4 > this.field1537) { - this.field1537 = var4; + if (var4 > this.field1594) { + this.field1594 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1563) { - this.field1563 = var3; + if (var3 > this.field1567) { + this.field1567 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Entity { } } - @ObfuscatedName("u") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IIIII)Ldx;" + signature = "(IIIII)Lel;" ) @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.field1676 = 0; + var8.field1698 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1676; + ++var8.field1698; } } - var8.field1677 = new int[var8.field1676]; - var8.field1678 = new int[var8.field1676]; - var8.field1656 = new int[var8.field1676]; + var8.field1685 = new int[var8.field1698]; + var8.field1704 = new int[var8.field1698]; + var8.field1705 = new int[var8.field1698]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1677[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1678[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1656[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field1685[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1704[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1705[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1686 = new byte[this.faceCount]; + var8.field1699 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1686[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1699[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1686[var11] = -1; + var8.field1699[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] = method2911(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method2902(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.field1561 != null && this.field1561[this.indices1[var16]] != null) { - var13 = this.field1561[this.indices1[var16]]; + if (this.field1591 != null && this.field1591[this.indices1[var16]] != null) { + var13 = this.field1591[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] = method2911(var15, var14); - if (this.field1561 != null && this.field1561[this.indices2[var16]] != null) { - var13 = this.field1561[this.indices2[var16]]; + var8.faceColors1[var16] = method2902(var15, var14); + if (this.field1591 != null && this.field1591[this.indices2[var16]] != null) { + var13 = this.field1591[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] = method2911(var15, var14); - if (this.field1561 != null && this.field1561[this.indices3[var16]] != null) { - var13 = this.field1561[this.indices3[var16]]; + var8.faceColors2[var16] = method2902(var15, var14); + if (this.field1591 != null && this.field1591[this.indices3[var16]] != null) { + var13 = this.field1591[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] = method2911(var15, var14); + var8.faceColors3[var16] = method2902(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] = method2861(var14); + var8.faceColors1[var16] = method2938(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field1561 != null && this.field1561[this.indices1[var16]] != null) { - var13 = this.field1561[this.indices1[var16]]; + if (this.field1591 != null && this.field1591[this.indices1[var16]] != null) { + var13 = this.field1591[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] = method2861(var14); - if (this.field1561 != null && this.field1561[this.indices2[var16]] != null) { - var13 = this.field1561[this.indices2[var16]]; + var8.faceColors1[var16] = method2938(var14); + if (this.field1591 != null && this.field1591[this.indices2[var16]] != null) { + var13 = this.field1591[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] = method2861(var14); - if (this.field1561 != null && this.field1561[this.indices3[var16]] != null) { - var13 = this.field1561[this.indices3[var16]]; + var8.faceColors2[var16] = method2938(var14); + if (this.field1591 != null && this.field1591[this.indices3[var16]] != null) { + var13 = this.field1591[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] = method2861(var14); + var8.faceColors3[var16] = method2938(var14); } } - this.method2846(); + this.method2901(); 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.field1675 = this.priority; + var8.field1701 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;II)Ldg;" + signature = "(Liy;II)Lea;" ) @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("a") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ldg;Ldg;IIIZ)V" + signature = "(Lea;Lea;IIIZ)V" ) - static void method2849(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2890(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1571; + ++field1588; 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.field1563) { + if (var11 <= var1.field1567) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1570 && var12 <= var1.field1567) { + if (var12 >= var1.field1595 && var12 <= var1.field1597) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1569 && var13 <= var1.field1537) { + if (var13 >= var1.field1599 && var13 <= var1.field1594) { 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.field1561 == null) { - var0.field1561 = new VertexNormal[var0.verticesCount]; + if (var0.field1591 == null) { + var0.field1591 = new VertexNormal[var0.verticesCount]; } - if (var1.field1561 == null) { - var1.field1561 = new VertexNormal[var8]; + if (var1.field1591 == null) { + var1.field1591 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1561[var9]; + VertexNormal var16 = var0.field1591[var9]; if (var16 == null) { - var16 = var0.field1561[var9] = new VertexNormal(var10); + var16 = var0.field1591[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1561[var14]; + VertexNormal var17 = var1.field1591[var14]; if (var17 == null) { - var17 = var1.field1561[var14] = new VertexNormal(var15); + var17 = var1.field1591[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; - field1559[var9] = field1571; - field1547[var14] = field1571; + field1576[var9] = field1588; + field1601[var14] = field1588; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1559[var0.indices1[var9]] == field1571 && field1559[var0.indices2[var9]] == field1571 && field1559[var0.indices3[var9]] == field1571) { + if (field1576[var0.indices1[var9]] == field1588 && field1576[var0.indices2[var9]] == field1588 && field1576[var0.indices3[var9]] == field1588) { 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 (field1571 == field1547[var1.indices1[var9]] && field1571 == field1547[var1.indices2[var9]] && field1571 == field1547[var1.indices3[var9]]) { + if (field1588 == field1601[var1.indices1[var9]] && field1588 == field1601[var1.indices2[var9]] && field1588 == field1601[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("ae") - static final int method2911(int var0, int var1) { + @ObfuscatedName("an") + static final int method2902(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("af") - static final int method2861(int var0) { + @ObfuscatedName("ai") + static final int method2938(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 b8ed2b3ddf..e4e2a1ef53 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,35 +1,103 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ed") @Implements("ModelData0") public class ModelData0 { - ModelData0() { - } - - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1209977249" + signature = "Lle;" ) - public static int method3322(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; - } + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2057553867 + ) + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + + ModelData0() { } @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1996001757" + signature = "(IIIZIZB)V", + garbageValue = "-80" ) - static final void method3323(String var0) { - class60.method1188(var0 + " is already on your ignore list"); + @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); + } + + } + + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "1566964636" + ) + @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); } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index be908b904a..886a5c9cbe 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,135 +3,132 @@ 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("bc") +@ObfuscatedName("bq") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lbc;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 860995379 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1865926071 - ) - @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1402384101 - ) - @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1430604587 - ) - @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = -854050918642271107L - ) - @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1497113395 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -500582999 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 207473425 + intValue = -1802673633 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 1304573896200149721L + intValue = 9279483 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lbq;" + ) + @Export("MouseHandler_instance") + static MouseHandler MouseHandler_instance; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 481106497 + ) + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -853983883 + ) + @Export("MouseHandler_currentButtonVolatile") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2069980405 + ) + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1032976335 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 8440490709549879739L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 440702865 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -7274898948584366517L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -806145355 + intValue = 329598021 ) @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1118071489 + intValue = -2102823313 ) @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2125266789 + intValue = 44004483 ) @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 3042635196210425157L + longValue = -4336093553213135153L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2023315893 + intValue = 1894311513 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 527604791 + intValue = -894585521 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 403246047 + intValue = -880195683 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -7854079785308338285L + longValue = 5747430308835367139L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("dd") - @ObfuscatedSignature( - signature = "Lia;" + @ObfuscatedName("ey") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("ge") + @ObfuscatedGetter( + intValue = 1073160651 ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive13") - static Archive archive13; + static int field529; static { MouseHandler_instance = new MouseHandler(); @@ -157,10 +154,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "6" + signature = "(Ljava/awt/event/MouseEvent;I)I", + garbageValue = "-1992651704" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -182,6 +179,24 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } + public final synchronized void mousePressed(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_lastPressedXVolatile = var1.getX(); + MouseHandler_lastPressedYVolatile = var1.getY(); + MouseHandler_lastPressedTimeMillisVolatile = class217.currentTimeMillis(); + MouseHandler_lastButtonVolatile = this.getButton(var1); + if (MouseHandler_lastButtonVolatile != 0) { + MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; + } + } + + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + public final synchronized void mouseReleased(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -194,6 +209,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + public final synchronized void mouseEntered(MouseEvent var1) { this.mouseMoved(var1); } @@ -222,165 +244,306 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi this.mouseMoved(var1); } - public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = WorldMapIcon_0.currentTimeMillis(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { - MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(II)Liw;", + garbageValue = "-222748117" + ) + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("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); } } - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-49" - ) - public static int method1111(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; + return var2.toString(); } @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lbg;Lbg;IZB)I", - garbageValue = "-55" + signature = "(Lkj;I)I", + garbageValue = "537227900" ) - @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.method1787() ? (var1.method1787() ? 0 : 1) : (var1.method1787() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1760() ? (var1.method1760() ? 0 : 1) : (var1.method1760() ? -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); + 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 { - return var0.id - var1.id; + 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("fw") + @ObfuscatedName("go") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1248000942" + signature = "(IIIII)V", + garbageValue = "-2142619406" ) - static void method1110() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1309 = null; - Client.packetWriter.field1305 = null; - Client.packetWriter.field1307 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1299 = 0; - Client.rebootTimer = 0; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.minimapState = 0; - Client.destinationX = 0; + 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 var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } + 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; + } - class192.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; + if (var10 == ByteArrayPool.localPlayer) { + var6 = var9; + continue; + } + } else { + var10 = Client.npcs[Client.npcIndices[var9 - var7]]; } + + WorldMapSection1.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); } - WorldMapLabelSize.method198(); - Projectile.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field851[var0] = true; + if (Client.renderSelf && var6 != -1) { + WorldMapSection1.drawActor2d(ByteArrayPool.localPlayer, var6, var0, var1, var2, var3); } - class238.method4415(); - } + if (var4) { + WorldMapSection1.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); + } - @ObfuscatedName("iq") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhn;I)Ljava/lang/String;", - garbageValue = "-1667382468" - ) - static String method1096(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; + 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; } - var0 = var0.substring(0, var3) + WorldMapID.method570(GrandExchangeOfferTotalQuantityComparator.method106(var1, var2 - 1)) + var0.substring(var3 + 2); + 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); } } - return var0; + } + + @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 af17b9d6bc..e2b08b5917 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -3,29 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bt") +@ObfuscatedName("bn") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("isRunning") boolean isRunning; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("lock") Object lock; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 114290231 + intValue = -1833503611 ) @Export("index") int index; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("xs") int[] xs; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("ys") int[] ys; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("millis") long[] millis; @@ -39,7 +40,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; FriendLoginUpdate.method5325(50L)) { + for (; this.isRunning; class169.method3541(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -52,149 +53,796 @@ public class MouseRecorder implements Runnable { } - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkp;Llp;B)Llp;", - garbageValue = "-44" + signature = "(Lkx;Lkx;Lkx;I)V", + garbageValue = "684092055" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = DynamicObject.method2293(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()); + @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", ""); } - var1.put((Node)var6, (long)var5); - } + 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(); + } - return var1; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;Lii;Lii;Lgw;I)Z", - garbageValue = "1360847882" - ) - public static boolean method1208(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class197.musicPatchesArchive = var0; - class197.musicSamplesArchive = var1; - UserComparator10.soundEffectsArchive = var2; - class197.midiPcmStream = var3; - return true; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-64" - ) - static final void method1209() { - 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.method3087(var7, var4, var1, var0); - int var11 = Rasterizer3D.method3088(var7, var4, var1, var0); - var7 = var10; - var10 = Rasterizer3D.method3087(var9, var5, var1, var0); - int var12 = Rasterizer3D.method3088(var9, var5, var1, var0); - var9 = var10; - var10 = Rasterizer3D.method3112(var6, var11, var3, var2); - var11 = Rasterizer3D.method3086(var6, var11, var3, var2); - var6 = var10; - var10 = Rasterizer3D.method3112(var8, var12, var3, var2); - var12 = Rasterizer3D.method3086(var8, var12, var3, var2); - ViewportMouse.field1729 = (var10 + var6) / 2; - ViewportMouse.field1731 = (var9 + var7) / 2; - ViewportMouse.field1736 = (var11 + var12) / 2; - TextureProvider.field1512 = (var10 - var6) / 2; - ViewportMouse.field1733 = (var9 - var7) / 2; - ViewportMouse.field1742 = (var12 - var11) / 2; - UserComparator7.field1978 = Math.abs(TextureProvider.field1512); - class4.field26 = Math.abs(ViewportMouse.field1733); - class43.field381 = Math.abs(ViewportMouse.field1742); - } - } - - @ObfuscatedName("gd") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1367330545" - ) - static boolean method1210() { - return (Client.drawPlayerNames & 4) != 0; - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "5" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = WorldMapSectionType.getTileHeight(var0, var1, Clock.Client_plane) - var2; - var0 -= HitSplatDefinition.cameraX; - var3 -= class51.cameraY; - var1 -= Actor.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[GrandExchangeOffer.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[GrandExchangeOffer.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[FriendSystem.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[FriendSystem.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var3 * var4 + var5 * var1 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + 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 { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + 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", ""); + } + } + } } - @ObfuscatedName("lr") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1867958927" + signature = "(ILce;ZI)I", + garbageValue = "1787965087" ) - static String method1207(String var0) { - PlayerType[] var1 = SecureRandomFuture.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(Language.method3728(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; + 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; } - } - return var0; + Client.field932 = (short)class278.method5039(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (Client.field932 <= 0) { + Client.field932 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + Interpreter.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + Interpreter.Interpreter_intStackSize -= 4; + Client.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; + } + } + + @ObfuscatedName("ew") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1951274332" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + WorldMapSection1.client.method1025(); + } + + 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); + } + } + + 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; + } } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 0506330537..7d0b3c2902 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("fi") +@ObfuscatedName("fq") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-3" + signature = "(I)I", + garbageValue = "65280" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index d72bfd91ea..761436f2e2 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("ao") +@ObfuscatedName("bc") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -895443251 + intValue = 1145232291 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "1202794162" + garbageValue = "637751715" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "57" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-1151636604" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-3" + signature = "(I)I", + garbageValue = "65280" ) @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 939d540bd4..a61158ccd2 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -3,52 +3,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gr") +@ObfuscatedName("hy") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("iz") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -185966491 + intValue = 1065297399 ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1990358497 - ) - int field2488; - @ObfuscatedName("t") + int field2484; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lcv;" + signature = "[Ldm;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("o") - short[] field2483; - @ObfuscatedName("e") - byte[] field2486; - @ObfuscatedName("i") - byte[] field2482; - @ObfuscatedName("g") + @ObfuscatedName("k") + short[] field2485; + @ObfuscatedName("d") + byte[] field2487; + @ObfuscatedName("w") + byte[] field2490; + @ObfuscatedName("v") @ObfuscatedSignature( signature = "[Lgf;" ) - MusicPatchNode2[] field2487; - @ObfuscatedName("d") - byte[] field2485; - @ObfuscatedName("l") - int[] field2489; + MusicPatchNode2[] field2488; + @ObfuscatedName("q") + byte[] field2489; + @ObfuscatedName("z") + int[] field2486; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2483 = new short[128]; - this.field2486 = new byte[128]; - this.field2482 = new byte[128]; - this.field2487 = new MusicPatchNode2[128]; - this.field2485 = new byte[128]; - this.field2489 = new int[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]; Buffer var2 = new Buffer(var1); int var3; @@ -95,11 +88,11 @@ public class MusicPatch extends Node { ++var2.offset; ++var9; - byte[] var36 = new byte[var9]; + byte[] var38 = new byte[var9]; int var12; int var14; if (var9 > 1) { - var36[1] = 1; + var38[1] = 1; int var13 = 1; var12 = 2; @@ -115,33 +108,33 @@ public class MusicPatch extends Node { var13 = var15; } - var36[var14] = (byte)var13; + var38[var14] = (byte)var13; } } else { var12 = var9; } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; - MusicPatchNode2 var38; - for (var14 = 0; var14 < var37.length; ++var14) { - var38 = var37[var14] = new MusicPatchNode2(); + MusicPatchNode2 var40; + for (var14 = 0; var14 < var39.length; ++var14) { + var40 = var39[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2402 = new byte[var16 * 2]; + var40.field2402 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2399 = new byte[var16 * 2 + 2]; - var38.field2399[1] = 64; + var40.field2398 = new byte[var16 * 2 + 2]; + var40.field2398[1] = 64; } } var14 = var2.readUnsignedByte(); - byte[] var45 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var47 = var14 > 0 ? new byte[var14 * 2] : null; var14 = var2.readUnsignedByte(); - byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var41 = var14 > 0 ? new byte[var14 * 2] : null; int var17; for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { @@ -161,16 +154,16 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2483[var20] = (short)var19; + this.field2485[var20] = (short)var19; } var19 = 0; - short[] var48; + short[] var50; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2483; - var48[var20] = (short)(var48[var20] + (var19 << 8)); + var50 = this.field2485; + var50[var20] = (short)(var50[var20] + (var19 << 8)); } var20 = 0; @@ -189,9 +182,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2483; - var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2489[var23] = var22; + var50 = this.field2485; + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field2486[var23] = var22; --var20; } @@ -201,7 +194,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2489[var24] != 0) { + if (this.field2486[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -212,7 +205,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2485[var24] = (byte)var23; + this.field2489[var24] = (byte)var23; --var20; } } @@ -222,7 +215,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2489[var25] != 0) { + if (this.field2486[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -233,20 +226,20 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2482[var25] = (byte)var24; + this.field2490[var25] = (byte)var24; --var20; } } var20 = 0; var21 = 0; - MusicPatchNode2 var40 = null; + MusicPatchNode2 var42 = null; int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2489[var26] != 0) { + if (this.field2486[var26] != 0) { if (var20 == 0) { - var40 = var37[var36[var21]]; + var42 = var39[var38[var21]]; if (var21 < var10.length) { var20 = var10[var21++]; } else { @@ -254,7 +247,7 @@ public class MusicPatch extends Node { } } - this.field2487[var26] = var40; + this.field2488[var26] = var42; --var20; } } @@ -272,65 +265,65 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2489[var27] > 0) { + if (this.field2486[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2486[var27] = (byte)var26; + this.field2487[var27] = (byte)var26; --var20; } - this.field2488 = var2.readUnsignedByte() + 1; + this.field2484 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; + var28 = var39[var27]; if (var28.field2402 != null) { for (var29 = 1; var29 < var28.field2402.length; var29 += 2) { var28.field2402[var29] = var2.readByte(); } } - if (var28.field2399 != null) { - for (var29 = 3; var29 < var28.field2399.length - 2; var29 += 2) { - var28.field2399[var29] = var2.readByte(); + if (var28.field2398 != null) { + for (var29 = 3; var29 < var28.field2398.length - 2; var29 += 2) { + var28.field2398[var29] = var2.readByte(); } } } - if (var45 != null) { - for (var27 = 1; var27 < var45.length; var27 += 2) { - var45[var27] = var2.readByte(); + if (var47 != null) { + for (var27 = 1; var27 < var47.length; var27 += 2) { + var47[var27] = var2.readByte(); } } - if (var39 != null) { - for (var27 = 1; var27 < var39.length; var27 += 2) { - var39[var27] = var2.readByte(); + if (var41 != null) { + for (var27 = 1; var27 < var41.length; var27 += 2) { + var41[var27] = var2.readByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2399 != null) { + var28 = var39[var27]; + if (var28.field2398 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2399.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2398.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2399[var29] = (byte)var19; + var28.field2398[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; + var28 = var39[var27]; if (var28.field2402 != null) { var19 = 0; for (var29 = 2; var29 < var28.field2402.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); + var19 = 1 + var19 + var2.readUnsignedByte(); var28.field2402[var29] = (byte)var19; } } @@ -340,164 +333,170 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var42; - byte var44; - if (var45 != null) { + int var35; + int var36; + int var44; + byte var46; + if (var47 != null) { var19 = var2.readUnsignedByte(); - var45[0] = (byte)var19; + var47[0] = (byte)var19; - for (var27 = 2; var27 < var45.length; var27 += 2) { + for (var27 = 2; var27 < var47.length; var27 += 2) { var19 = 1 + var19 + var2.readUnsignedByte(); - var45[var27] = (byte)var19; + var47[var27] = (byte)var19; } - var44 = var45[0]; - byte var41 = var45[1]; + var46 = var47[0]; + byte var43 = var47[1]; - for (var29 = 0; var29 < var44; ++var29) { - this.field2486[var29] = (byte)(var41 * this.field2486[var29] + 32 >> 6); + for (var29 = 0; var29 < var46; ++var29) { + this.field2487[var29] = (byte)(var43 * this.field2487[var29] + 32 >> 6); } - for (var29 = 2; var29 < var45.length; var29 += 2) { - var30 = var45[var29]; - byte var31 = var45[var29 + 1]; - var32 = var41 * (var30 - var44) + (var30 - var44) / 2; + for (var29 = 2; var29 < var47.length; var29 += 2) { + var30 = var47[var29]; + byte var31 = var47[var29 + 1]; + var32 = var43 * (var30 - var46) + (var30 - var46) / 2; - for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapLabel.method440(var32, var30 - var44); - this.field2486[var33] = (byte)(var34 * this.field2486[var33] + 32 >> 6); - var32 += var31 - var41; + 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; } - var44 = var30; - var41 = var31; + var46 = var30; + var43 = var31; } - for (var42 = var44; var42 < 128; ++var42) { - this.field2486[var42] = (byte)(var41 * this.field2486[var42] + 32 >> 6); + for (var44 = var46; var44 < 128; ++var44) { + this.field2487[var44] = (byte)(var43 * this.field2487[var44] + 32 >> 6); } - var38 = null; + var40 = null; } - if (var39 != null) { + if (var41 != null) { var19 = var2.readUnsignedByte(); - var39[0] = (byte)var19; + var41[0] = (byte)var19; - for (var27 = 2; var27 < var39.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var39[var27] = (byte)var19; + for (var27 = 2; var27 < var41.length; var27 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var41[var27] = (byte)var19; } - var44 = var39[0]; - int var47 = var39[1] << 1; + var46 = var41[0]; + int var49 = var41[1] << 1; - for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2482[var29] & 255); - if (var42 < 0) { - var42 = 0; + for (var29 = 0; var29 < var46; ++var29) { + var44 = var49 + (this.field2490[var29] & 255); + if (var44 < 0) { + var44 = 0; } - if (var42 > 128) { - var42 = 128; + if (var44 > 128) { + var44 = 128; } - this.field2482[var29] = (byte)var42; + this.field2490[var29] = (byte)var44; } - 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; + 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; - for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapLabel.method440(var32, var30 - var44); - int var35 = var34 + (this.field2482[var33] & 255); - if (var35 < 0) { - var35 = 0; + 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; } - if (var35 > 128) { - var35 = 128; + if (var37 > 128) { + var37 = 128; } - this.field2482[var33] = (byte)var35; - var32 += var43 - var47; + this.field2490[var33] = (byte)var37; + var32 += var45 - var49; } - var44 = var30; - var47 = var43; + var46 = var30; + var49 = var45; } - for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2482[var42] & 255); - if (var43 < 0) { - var43 = 0; + for (var44 = var46; var44 < 128; ++var44) { + var45 = var49 + (this.field2490[var44] & 255); + if (var45 < 0) { + var45 = 0; } - if (var43 > 128) { - var43 = 128; + if (var45 > 128) { + var45 = 128; } - this.field2482[var42] = (byte)var43; + this.field2490[var44] = (byte)var45; } - Object var46 = null; + Object var48 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2404 = var2.readUnsignedByte(); + var39[var27].field2396 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; + var28 = var39[var27]; if (var28.field2402 != null) { - var28.field2401 = var2.readUnsignedByte(); + var28.field2397 = var2.readUnsignedByte(); } - if (var28.field2399 != null) { + if (var28.field2398 != null) { var28.field2400 = var2.readUnsignedByte(); } - if (var28.field2404 > 0) { - var28.field2403 = var2.readUnsignedByte(); + if (var28.field2396 > 0) { + var28.field2399 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2405 = var2.readUnsignedByte(); + var39[var27].field2401 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2405 > 0) { - var28.field2398 = var2.readUnsignedByte(); + var28 = var39[var27]; + if (var28.field2401 > 0) { + var28.field2395 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2398 > 0) { - var28.field2406 = var2.readUnsignedByte(); + var28 = var39[var27]; + if (var28.field2395 > 0) { + var28.field2394 = var2.readUnsignedByte(); } } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldv;[B[IB)Z", - garbageValue = "83" + signature = "(Ldk;[B[IB)Z", + garbageValue = "50" ) - boolean method3952(SoundCache var1, byte[] var2, int[] var3) { + boolean method3970(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.field2489[var7]; + int var8 = this.field2486[var7]; if (var8 != 0) { if (var5 != var8) { var5 = var8--; @@ -514,7 +513,7 @@ public class MusicPatch extends Node { if (var6 != null) { this.rawSounds[var7] = var6; - this.field2489[var7] = 0; + this.field2486[var7] = 0; } } } @@ -523,374 +522,193 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-979915375" + signature = "(B)V", + garbageValue = "106" ) @Export("clear") void clear() { - this.field2489 = null; + this.field2486 = null; } - @ObfuscatedName("ax") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-1621076022" + signature = "(Ljava/lang/CharSequence;B)Z", + garbageValue = "119" ) - static int method3962(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (KeyHandler.friendSystem.field1063 == 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -2; - } else if (KeyHandler.friendSystem.field1063 == 1) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.friendsList.getSize(); + @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; } - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)KeyHandler.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + label85: { + char var7 = var0.charAt(var6); + if (var6 == 0) { + if (var7 == '-') { + var2 = true; + break label85; + } + + if (var7 == '+') { + break label85; + } } - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)KeyHandler.friendSystem.friendsList.get(var3)).world; + int var9; + if (var7 >= '0' && var7 <= '9') { + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { + var9 = var7 - '7'; } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + if (var7 < 'a' || var7 > 'z') { + var1 = false; + break; + } + + var9 = var7 - 'W'; } - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)KeyHandler.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + if (var9 >= 10) { + var1 = false; + break; } - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - BZip2State.method5833(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - KeyHandler.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - KeyHandler.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - KeyHandler.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - KeyHandler.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var5 = MouseRecorder.method1207(var5); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.isFriended(new Username(var5, class192.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + 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(); } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - WorldMapID.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - GrandExchangeOfferAgeComparator.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - MenuAction.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!KeyHandler.friendSystem.method1857()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)KeyHandler.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var5 = MouseRecorder.method1207(var5); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.isIgnored(new Username(var5, class192.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(class192.localPlayer.username)) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - KeyHandler.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - KeyHandler.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - KeyHandler.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - KeyHandler.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[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--class320.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[--class320.Interpreter_intStackSize] == 1; - KeyHandler.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; } } } + + } + + @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; + } + + } else { + if (var7 != -1) { + Client.field679[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field679[var8] = true; + } + } + + } } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 7fb09624f3..0f2a343cc8 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,186 +4,256 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("hz") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 158121519 - ) - int field2447; - @ObfuscatedName("t") + @ObfuscatedName("dl") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Llt;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1338967265 + ) + int field2452; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lhy;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lcv;" + signature = "Ldm;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lgf;" ) - MusicPatchNode2 field2445; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1663286447 - ) - int field2449; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -816079619 - ) - int field2450; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1312167649 - ) - int field2451; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 109203307 - ) - int field2457; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1309254043 - ) - int field2446; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -83070697 - ) - int field2454; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -280788283 - ) - int field2455; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1453033600 - ) - int field2456; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1758842307 - ) - int field2448; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1607529919 - ) - int field2458; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1043883777 - ) - int field2459; + MusicPatchNode2 field2460; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1085218982 + intValue = -1651211223 ) - int field2460; - @ObfuscatedName("k") + int field2467; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 559765115 + intValue = -454114325 ) - int field2461; + int field2464; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 586713195 + intValue = 1747303555 ) - int field2453; + 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; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1836492369 + ) + int field2456; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 705413515 + ) + int field2457; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1352510901 + ) + int field2458; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2063074809 + ) + int field2459; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1989506561 + ) + int field2448; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1064961041 + ) + int field2461; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 32368267 + ) + int field2449; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lde;" + signature = "Ldy;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -923217515 + intValue = -573766161 ) - int field2464; - @ObfuscatedName("b") + int field2453; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1975530933 + intValue = -1090387417 ) - int field2465; + int field2462; MusicPatchNode() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1631381229" + garbageValue = "-392566943" ) - void method3896() { + void method3917() { this.patch = null; this.rawSound = null; - this.field2445 = null; + this.field2460 = null; this.stream = null; } - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)[Lhx;", - garbageValue = "-72" - ) - public static StudioGame[] method3898() { - return new StudioGame[]{StudioGame.game5, StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.oldscape, StudioGame.game3}; - } - @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "55138406" + signature = "([Ljava/lang/CharSequence;IIS)Ljava/lang/String;", + garbageValue = "313" ) - static final int method3903() { - return ViewportMouse.ViewportMouse_x; - } + 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(); + } else { + int var8 = var2 + var1; + int var4 = 0; - @ObfuscatedName("ii") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "18" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = SpriteMask.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - class4.runScriptEvent(var5); + 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(); } - - Client.field802 = var3; - Client.isSpellSelected = true; - FontName.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - NetSocket.selectedSpellFlags = var2; - NPCDefinition.invalidateWidget(var4); } - @ObfuscatedName("ji") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1594747914" + signature = "(I)[Llu;", + garbageValue = "-133902824" ) - static boolean method3902(int var0) { - for (int var1 = 0; var1 < Client.field762; ++var1) { - if (Client.field869[var1] == var0) { - return true; + @Export("FillMode_values") + public static class332[] FillMode_values() { + return new class332[]{class332.SOLID, class332.field3875, class332.field3874}; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)Lhe;", + garbageValue = "-47" + ) + @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 false; + 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]; + } 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 > WorldMapLabel.canvasWidth) { + var7 = WorldMapLabel.canvasWidth - var2; + } + + if (var7 < 0) { + var7 = 0; + } + + int var8 = var1; + if (var1 + var3 > Varps.canvasHeight) { + var8 = Varps.canvasHeight - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + WorldMapDecoration.menuX = var7; + PacketBufferNode.menuY = var8; + class49.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 c556b85cc2..8b8baf16f1 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,50 +1,139 @@ +import 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("gf") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("c") + @ObfuscatedName("x") byte[] field2402; - @ObfuscatedName("t") - byte[] field2399; - @ObfuscatedName("o") + @ObfuscatedName("m") + byte[] field2398; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1514989189 + intValue = -224180223 ) - int field2404; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -781980409 - ) - int field2401; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 684160431 - ) - int field2400; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1588792851 - ) - int field2403; + int field2396; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 768856751 + intValue = 227896201 ) - int field2398; - @ObfuscatedName("l") + int field2397; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -758187287 + intValue = -615138819 ) - int field2405; - @ObfuscatedName("j") + int field2400; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -665826863 + intValue = 1353186567 ) - int field2406; + int field2399; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 22420513 + ) + int field2395; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2050807293 + ) + int field2401; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1299814217 + ) + int field2394; MusicPatchNode2() { } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Liy;III)Lla;", + garbageValue = "273345835" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !UserComparator7.method3516(var0, var1, var2) ? null : ArchiveDisk.method5932(); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lkb;IIIIIIB)V", + garbageValue = "16" + ) + @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(); + } + } + } + + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 49eaa5f53d..0e86cb0926 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -3,30 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("hs") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("c") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lld;" + ) + static Bounds field2495; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgi;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lch;" + signature = "Ldz;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgw;)V" + signature = "(Lgi;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -34,48 +39,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lgu;[IIIII)V", - garbageValue = "-1926827063" + signature = "(Lhz;[IIIIB)V", + garbageValue = "56" ) - void method3968(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2429[var1.field2447] & 4) != 0 && var1.field2459 < 0) { - int var6 = this.superStream.field2422[var1.field2447] / PcmPlayer.field1398; + 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; while (true) { - int var7 = (var6 + 1048575 - var1.field2465) / var6; + int var7 = (var6 + 1048575 - var1.field2462) / var6; if (var7 > var4) { - var1.field2465 += var6 * var4; + var1.field2462 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2465 += var7 * var6 - 1048576; - int var8 = PcmPlayer.field1398 / 100; + var1.field2462 += var7 * var6 - 1048576; + int var8 = PcmPlayer.field1421 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2432[var1.field2447] == 0) { - var1.stream = RawPcmStream.method2673(var1.rawSound, var10.method2621(), var10.method2612(), var10.method2613()); + if (this.superStream.field2431[var1.field2452] == 0) { + var1.stream = RawPcmStream.method2685(var1.rawSound, var10.method2670(), var10.method2662(), var10.method2663()); } else { - var1.stream = RawPcmStream.method2673(var1.rawSound, var10.method2621(), 0, var10.method2613()); - this.superStream.method3775(var1, var1.patch.field2483[var1.field2450] < 0); - var1.stream.method2614(var8, var10.method2612()); + 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()); } - if (var1.patch.field2483[var1.field2450] < 0) { + if (var1.patch.field2485[var1.field2464] < 0) { var1.stream.setNumLoops(-1); } - var10.method2619(var8); + var10.method2706(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2712()) { + if (var10.method2672()) { this.mixer.addSubStream(var10); } } @@ -84,38 +89,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgu;II)V", - garbageValue = "1369494496" + signature = "(Lhz;II)V", + garbageValue = "2036025263" ) - void method3972(MusicPatchNode var1, int var2) { - if ((this.superStream.field2429[var1.field2447] & 4) != 0 && var1.field2459 < 0) { - int var3 = this.superStream.field2422[var1.field2447] / PcmPlayer.field1398; - int var4 = (var3 + 1048575 - var1.field2465) / var3; - var1.field2465 = var3 * var2 + var1.field2465 & 1048575; + 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; if (var4 <= var2) { - if (this.superStream.field2432[var1.field2447] == 0) { - var1.stream = RawPcmStream.method2673(var1.rawSound, var1.stream.method2621(), var1.stream.method2612(), var1.stream.method2613()); + if (this.superStream.field2431[var1.field2452] == 0) { + var1.stream = RawPcmStream.method2685(var1.rawSound, var1.stream.method2670(), var1.stream.method2662(), var1.stream.method2663()); } else { - var1.stream = RawPcmStream.method2673(var1.rawSound, var1.stream.method2621(), 0, var1.stream.method2613()); - this.superStream.method3775(var1, var1.patch.field2483[var1.field2450] < 0); + var1.stream = RawPcmStream.method2685(var1.rawSound, var1.stream.method2670(), 0, var1.stream.method2663()); + this.superStream.method3852(var1, var1.patch.field2485[var1.field2464] < 0); } - if (var1.patch.field2483[var1.field2450] < 0) { + if (var1.patch.field2485[var1.field2464] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2465 / var3; + var2 = var1.field2462 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -127,9 +132,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -144,58 +149,173 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("l") - protected int vmethod3965() { + @ObfuscatedName("z") + protected int vmethod3984() { return 0; } - @ObfuscatedName("j") + @ObfuscatedName("t") @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.method3822(var6)) { + if (!this.superStream.method3826(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2464) { - this.method3968(var6, var1, var4, var5, var5 + var4); - var6.field2464 -= var5; + if (var5 <= var6.field2453) { + this.method3992(var6, var1, var4, var5, var4 + var5); + var6.field2453 -= var5; break; } - this.method3968(var6, var1, var4, var6.field2464, var4 + var5); - var4 += var6.field2464; - var5 -= var6.field2464; - } while(!this.superStream.method3848(var6, var1, var4, var5)); + this.method3992(var6, var1, var4, var6.field2453, var4 + var5); + var4 += var6.field2453; + var5 -= var6.field2453; + } while(!this.superStream.method3884(var6, var1, var4, var5)); } } } - @ObfuscatedName("p") + @ObfuscatedName("s") @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.method3822(var3)) { + if (!this.superStream.method3826(var3)) { int var2 = var1; do { - if (var2 <= var3.field2464) { - this.method3972(var3, var2); - var3.field2464 -= var2; + if (var2 <= var3.field2453) { + this.method3989(var3, var2); + var3.field2453 -= var2; break; } - this.method3972(var3, var3.field2464); - var2 -= var3.field2464; - } while(!this.superStream.method3848(var3, (int[])null, 0, var2)); + this.method3989(var3, var3.field2453); + var2 -= var3.field2453; + } while(!this.superStream.method3884(var3, (int[])null, 0, var2)); } } } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1600061666" + ) + 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(class74.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; + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 2e017c956b..a8c4fb2d91 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("gk") +@ObfuscatedName("hh") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)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; - label219: + label232: 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 label219; + continue label232; } if (var64 == 23) { @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("t") - void method3993() { + @ObfuscatedName("m") + void method4007() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -416,18 +416,18 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;II)Lgk;" + signature = "(Liy;II)Lhh;" ) @Export("readTrack") - static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index ae8d1dfb03..698263df79 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -2,16 +2,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cg") +@ObfuscatedName("cd") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("i") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("c") + @ObfuscatedName("di") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lih;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Ljj;" ) @Export("definition") NPCDefinition definition; @@ -19,12 +23,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IBI)V", - garbageValue = "-1099283793" + garbageValue = "1357831491" ) - final void method2083(int var1, byte var2) { + final void method2133(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -63,7 +67,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { + if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } @@ -82,13 +86,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIZB)V", - garbageValue = "0" + garbageValue = "88" ) - final void method2077(int var1, int var2, boolean var3) { - if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { + final void method2136(int var1, int var2, boolean var3) { + if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } @@ -114,26 +118,26 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field998 = 0; - super.field997 = 0; + super.field1032 = 0; + super.field1031 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.pathX[0] * 128 + super.field942 * 2013925376; - super.y = super.pathY[0] * 128 + super.field942 * 2013925376; + super.x = super.field976 * 64 + super.pathX[0] * 128; + super.y = super.field976 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -141,9 +145,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field980, 0); + var4.offsetBy(0, -super.field1033, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -158,146 +162,123 @@ public final class NPC extends Actor { } } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-515224238" + garbageValue = "116176402" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-728200028" - ) - public static boolean method2088(int var0) { - return (var0 >> 21 & 1) != 0; - } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-213957915" - ) - static void method2079() { - Login.loginIndex = 24; - Tiles.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + 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("ib") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;I)V", - garbageValue = "-1867991224" + signature = "(ILce;ZI)I", + garbageValue = "-1441905186" ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = SpriteMask.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; - class4.runScriptEvent(var6); + 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; } - boolean var11 = true; - if (var5.contentType > 0) { - var11 = BufferedSink.method5915(var5); - } + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; + } + } - if (var11) { - int var8 = WorldMapIcon_0.getWidgetClickMask(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = TilePaint.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(ILce;ZB)I", + garbageValue = "-41" + ) + 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; } } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index d61902331a..f9c94e543e 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -3,187 +3,186 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iz") +@ObfuscatedName("jj") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("NpcDefinition_cached") - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("e") + static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("i") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1707921153 + intValue = -389469873 ) @Export("id") public int id; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("name") public String name; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1764786613 + intValue = 1343476403 ) @Export("size") public int size; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("models") int[] models; - @ObfuscatedName("j") - int[] field3467; - @ObfuscatedName("m") + @ObfuscatedName("t") + int[] field3483; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1040050113 + intValue = -1727903795 ) @Export("readySequence") public int readySequence; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -710216927 + intValue = 1188737805 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -188091011 + intValue = -1064545751 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -987219047 + intValue = 1167118343 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -444402749 + intValue = -899359333 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1834649411 + intValue = 1764143325 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 703794891 + intValue = 594616055 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("actions") public String[] actions; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1620337361 + intValue = -1913171313 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 629834407 + intValue = -628781453 ) @Export("widthScale") int widthScale; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -867665195 + intValue = 831579505 ) @Export("heightScale") int heightScale; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("isVisible") public boolean isVisible; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1609629677 + intValue = -2049591517 ) @Export("ambient") int ambient; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 56751531 + intValue = 1268595579 ) @Export("contrast") int contrast; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1994920091 + intValue = -1614239771 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -247642311 + intValue = 1421039835 ) @Export("rotation") public int rotation; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("transforms") public int[] transforms; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1674933673 + intValue = -1643554833 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -912879563 + intValue = 1966128939 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("isClickable") public boolean isClickable; @ObfuscatedName("as") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -220,19 +219,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "37" + garbageValue = "33" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "44812768" + signature = "(Lkb;B)V", + garbageValue = "-24" ) @Export("decode") void decode(Buffer var1) { @@ -246,10 +245,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "-38" + signature = "(Lkb;II)V", + garbageValue = "269088844" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -304,10 +303,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3467 = new int[var3]; + this.field3483 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3467[var4] = var1.readUnsignedShort(); + this.field3483[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -322,7 +321,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 100) { this.ambient = var1.readByte(); } else if (var2 == 101) { - this.contrast = var1.readByte(); + this.contrast = var1.readByte() * 5; } else if (var2 == 102) { this.headIconPrayer = var1.readUnsignedShort(); } else if (var2 == 103) { @@ -335,7 +334,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = MouseRecorder.readStringIntParameters(var1, this.params); + this.params = NetCache.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -371,10 +370,10 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lip;ILip;IB)Ldx;", - garbageValue = "-1" + signature = "(Ljc;ILjc;II)Lel;", + garbageValue = "-1957935091" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -422,7 +421,7 @@ public class NPCDefinition extends DualNode { } } - var5 = var11.toModel(this.ambient + 64, this.contrast * 5 + 850, -30, -50, -30); + var5 = var11.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); NpcDefinition_cachedModels.put(var5, (long)this.id); } @@ -445,23 +444,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Ldg;", - garbageValue = "1870202783" + signature = "(B)Lea;", + garbageValue = "4" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3467 == null) { + } else if (this.field3483 == null) { return null; } else { boolean var5 = false; - for (int var2 = 0; var2 < this.field3467.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3467[var2], 0)) { + for (int var2 = 0; var2 < this.field3483.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3483[var2], 0)) { var5 = true; } } @@ -469,10 +468,10 @@ public class NPCDefinition extends DualNode { if (var5) { return null; } else { - ModelData[] var6 = new ModelData[this.field3467.length]; + ModelData[] var6 = new ModelData[this.field3483.length]; - for (int var3 = 0; var3 < this.field3467.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3467[var3], 0); + for (int var3 = 0; var3 < this.field3483.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3483[var3], 0); } ModelData var7; @@ -500,16 +499,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Liz;", - garbageValue = "38" + signature = "(I)Ljj;", + garbageValue = "-2051225078" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); + var1 = Projectile.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -521,13 +520,13 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? NetCache.getNpcDefinition(var2) : null; + return var2 != -1 ? class237.getNpcDefinition(var2) : null; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "780898227" + garbageValue = "1945900441" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -536,7 +535,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); + var1 = Projectile.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -549,62 +548,36 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-2108676246" + signature = "(IIS)I", + garbageValue = "-11262" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class185.method3686(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "2127208203" + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-61" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorDecoration.method2914(this.params, var1, var2); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "879039654" - ) - static int method4818(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - signature = "(Lhn;I)V", - garbageValue = "285871086" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field850) { - Client.field851[var0.rootIndex] = true; - } - + return class9.method122(this.params, var1, var2); } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 63db9fec69..68366f7fdb 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fn") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 5230398222733750155L + longValue = 4971967116578097939L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,30 +18,30 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "-1351231250" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-561232674" + garbageValue = "-1723558008" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; + long var3 = 1000000L * (long)var2; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - FriendLoginUpdate.method5325(var5 / 1000000L); + class169.method3541(var5 / 1000000L); long var7 = System.nanoTime(); int var9; diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 2c6197d839..3873a685a1 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,3 +1,8 @@ +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; @@ -5,111 +10,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("ia") @Implements("NetCache") public class NetCache { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkr;" + signature = "Llt;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 840388525 + intValue = 1826620623 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -4475695681289819083L + longValue = 2064372708518790169L ) - public static long field3170; - @ObfuscatedName("e") + public static long field3165; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1544867723 + intValue = 1340946103 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 562199049 + intValue = -1858030685 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ljq;" + signature = "Ljl;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("NetCache_pendingWrites") - public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("m") + static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1327913125 + intValue = -2108405401 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 818633537 + intValue = 1540381013 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lix;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lkb;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1652930621 - ) - public static int field3181; - @ObfuscatedName("z") - @Export("NetCache_crc") - static CRC32 NetCache_crc; - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Lia;" + signature = "Lkb;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -488987433 + ) + public static int field3178; + @ObfuscatedName("b") + @Export("NetCache_crc") + public static CRC32 NetCache_crc; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "[Lih;" ) @Export("NetCache_archives") - static Archive[] NetCache_archives; - @ObfuscatedName("b") - public static byte field3184; - @ObfuscatedName("r") + public static Archive[] NetCache_archives; + @ObfuscatedName("o") + public static byte field3163; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -287174121 + intValue = 2067454381 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1375722445 + intValue = 1675917745 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -126,96 +143,126 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3181 = 0; + field3178 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3184 = 0; + field3163 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Liz;", - garbageValue = "79077079" + signature = "(Ljava/lang/CharSequence;I)J", + garbageValue = "706335608" ) - @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)); + 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); } - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; + if (var1 >= 177917621779460413L) { + break; + } } + + while (0L == var1 % 37L && var1 != 0L) { + var1 /= 37L; + } + + return var1; } - @ObfuscatedName("ft") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-824025022" + signature = "(Lkb;Lln;I)Lln;", + garbageValue = "-1200596784" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - WorldMapSection2.clientPreferences.roofsHidden = !WorldMapSection2.clientPreferences.roofsHidden; - WorldMapData_1.savePreferences(); - if (WorldMapSection2.clientPreferences.roofsHidden) { - ClientPreferences.addGameMessage(99, "", "Roofs are now all hidden"); + @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 { - ClientPreferences.addGameMessage(99, "", "Roofs will only be removed selectively"); + var6 = new IntegerNode(var0.readInt()); } + + var1.put((Node)var6, (long)var5); } - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; + 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 = ""; } - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; - } + 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(); - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } + 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; + } - if (var0.equalsIgnoreCase("showcoord")) { - WorldMapIcon_0.worldMap.showCoord = !WorldMapIcon_0.worldMap.showCoord; - } + var7 = var7.substring(0, var8); + } - if (var0.equalsIgnoreCase("fpson")) { - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - WorldMapIcon_1.method308(); + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; } } - - PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index ca85f673c9..607ebca026 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,53 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("ix") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("fn") - @ObfuscatedSignature( - signature = "Lfw;" + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = 642121189 ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("c") + static int field3126; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lih;" ) @Export("archive") - Archive archive; - @ObfuscatedName("t") + public Archive archive; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -335622229 + intValue = -782171773 ) @Export("crc") - int crc; - @ObfuscatedName("o") + public int crc; + @ObfuscatedName("k") @Export("padding") - byte padding; + public byte padding; NetFileRequest() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([I[IB)V", - garbageValue = "100" + signature = "(I)[Lje;", + garbageValue = "534124687" ) - public static void method4217(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - ByteArrayPool.ByteArrayPool_alternativeSizes = var0; - VerticalAlignment.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; - - for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; - } - - } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; - VerticalAlignment.ByteArrayPool_altSizeArrayCounts = null; - ByteArrayPool.ByteArrayPool_arrays = null; - } + static HorizontalAlignment[] method4244() { + return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3453, HorizontalAlignment.field3458}; } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index cd998ca5c8..9f0d529c22 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -8,95 +8,67 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fe") +@ObfuscatedName("fa") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("sd") - @ObfuscatedSignature( - signature = "Llv;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("dq") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("ep") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("fi") - @ObfuscatedSignature( - signature = "Lkz;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("mj") - @ObfuscatedGetter( - intValue = -1177586883 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("socket") Socket socket; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("isClosed") boolean isClosed; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lff;" + signature = "Lfs;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfr;" ) @Export("task") Task task; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -602302945 + intValue = -883377573 ) @Export("outLength") int outLength; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -578221925 + intValue = 1663813013 ) @Export("outOffset") int outOffset; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1215285735 + intValue = -667900149 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 639451829 + intValue = -1103298859 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lff;I)V" + signature = "(Ljava/net/Socket;Lfs;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -115,10 +87,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-259367480" + signature = "(B)V", + garbageValue = "7" ) @Export("close") public void close() { @@ -130,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - FriendLoginUpdate.method5325(1L); + class169.method3541(1L); } if (this.task.status == 1) { @@ -145,30 +117,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-108" + signature = "(I)I", + garbageValue = "1436175029" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2004103994" + garbageValue = "195119972" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-624446357" + signature = "(IB)Z", + garbageValue = "0" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -179,10 +151,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1847434030" + signature = "([BIIB)I", + garbageValue = "33" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -204,10 +176,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "1797414909" + signature = "([BIIB)V", + garbageValue = "-21" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -239,10 +211,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "977025272" + garbageValue = "-2040746201" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -260,7 +232,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var1; int var2; synchronized(this) { - if (this.outLength == this.outOffset) { + if (this.outOffset == this.outLength) { if (this.isClosed) { break label84; } @@ -292,7 +264,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; try { - if (this.outLength == this.outOffset) { + if (this.outOffset == this.outLength) { this.outputStream.flush(); } } catch (IOException var8) { @@ -320,700 +292,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - class225.RunException_sendStackTrace((String)null, var12); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var12); } } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(ILky;Lia;I)V", - garbageValue = "595015097" - ) - static void method3613(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; - } - } - } - - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1753470455" - ) - static void method3595() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3150 == 0) { - class218.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class218.ArchiveDiskActionHandler_thread.setDaemon(true); - class218.ArchiveDiskActionHandler_thread.start(); - class218.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3150 = 600; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Lko;Lko;Lko;B)V", - garbageValue = "-120" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (Username.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - class96.loginBoxCenter = Login.loginBoxX + 180; - int var6; - int var9; - byte var23; - int var24; - int var26; - int var33; - int var41; - if (Login.worldSelectOpen) { - Archive var32; - if (UserComparator6.worldSelectBackSprites == null) { - var32 = UserComparator8.archive8; - var33 = var32.getGroupId("sl_back"); - var6 = var32.getFileId(var33, ""); - Sprite[] var7; - if (!class228.method4199(var32, var33, var6)) { - var7 = null; - } else { - var7 = HorizontalAlignment.method4783(); - } - - UserComparator6.worldSelectBackSprites = var7; - } - - if (ReflectionCheck.worldSelectFlagSprites == null) { - ReflectionCheck.worldSelectFlagSprites = FaceNormal.method3336(UserComparator8.archive8, "sl_flags", ""); - } - - int var38; - if (ItemContainer.worldSelectArrows == null) { - var32 = UserComparator8.archive8; - var33 = var32.getGroupId("sl_arrows"); - var6 = var32.getFileId(var33, ""); - IndexedSprite[] var35; - if (!class228.method4199(var32, var33, var6)) { - var35 = null; - } else { - IndexedSprite[] var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (var38 = 0; var38 < class326.SpriteBuffer_spriteCount; ++var38) { - IndexedSprite var30 = var29[var38] = new IndexedSprite(); - var30.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var30.height = class326.SpriteBuffer_spriteHeight; - var30.xOffset = Huffman.SpriteBuffer_xOffsets[var38]; - var30.yOffset = NPC.SpriteBuffer_yOffsets[var38]; - var30.subWidth = class326.SpriteBuffer_spriteWidths[var38]; - var30.subHeight = class326.SpriteBuffer_spriteHeights[var38]; - var30.palette = class326.SpriteBuffer_spritePalette; - var30.pixels = class326.SpriteBuffer_pixels[var38]; - } - - DynamicObject.method2292(); - var35 = var29; - } - - ItemContainer.worldSelectArrows = var35; - } - - if (DynamicObject.worldSelectStars == null) { - DynamicObject.worldSelectStars = FaceNormal.method3336(UserComparator8.archive8, "sl_stars", ""); - } - - if (GrandExchangeEvent.worldSelectLeftSprite == null) { - GrandExchangeEvent.worldSelectLeftSprite = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.archive8, "leftarrow", ""); - } - - if (class32.worldSelectRightSprite == null) { - class32.worldSelectRightSprite = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.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 (DynamicObject.worldSelectStars != null) { - DynamicObject.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - DynamicObject.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (ItemContainer.worldSelectArrows != null) { - var41 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - ItemContainer.worldSelectArrows[2].drawAt(var41, 4); - } else { - ItemContainer.worldSelectArrows[0].drawAt(var41, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - ItemContainer.worldSelectArrows[3].drawAt(var41 + 15, 4); - } else { - ItemContainer.worldSelectArrows[1].drawAt(var41 + 15, 4); - } - - var0.draw("World", var41 + 32, 17, 16777215, -1); - var24 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - ItemContainer.worldSelectArrows[2].drawAt(var24, 4); - } else { - ItemContainer.worldSelectArrows[0].drawAt(var24, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - ItemContainer.worldSelectArrows[3].drawAt(var24 + 15, 4); - } else { - ItemContainer.worldSelectArrows[1].drawAt(var24 + 15, 4); - } - - var0.draw("Players", var24 + 32, 17, 16777215, -1); - var33 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - ItemContainer.worldSelectArrows[2].drawAt(var33, 4); - } else { - ItemContainer.worldSelectArrows[0].drawAt(var33, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - ItemContainer.worldSelectArrows[3].drawAt(var33 + 15, 4); - } else { - ItemContainer.worldSelectArrows[1].drawAt(var33 + 15, 4); - } - - var0.draw("Location", var33 + 32, 17, 16777215, -1); - var6 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - ItemContainer.worldSelectArrows[2].drawAt(var6, 4); - } else { - ItemContainer.worldSelectArrows[0].drawAt(var6, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - ItemContainer.worldSelectArrows[3].drawAt(var6 + 15, 4); - } else { - ItemContainer.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 (UserComparator6.worldSelectBackSprites != null) { - var23 = 88; - byte var45 = 19; - var33 = 765 / (var23 + 1) - 1; - var6 = 480 / (var45 + 1); - - int var37; - do { - var26 = var6; - var37 = var33; - if (var6 * (var33 - 1) >= World.World_count) { - --var33; - } - - if (var33 * (var6 - 1) >= World.World_count) { - --var6; - } - - if (var33 * (var6 - 1) >= World.World_count) { - --var6; - } - } while(var6 != var26 || var37 != var33); - - var26 = (765 - var23 * var33) / (var33 + 1); - if (var26 > 5) { - var26 = 5; - } - - var37 = (480 - var45 * var6) / (var6 + 1); - if (var37 > 5) { - var37 = 5; - } - - var9 = (765 - var33 * var23 - var26 * (var33 - 1)) / 2; - var38 = (480 - var45 * var6 - var37 * (var6 - 1)) / 2; - int var11 = (var6 + World.World_count - 1) / var6; - Login.worldSelectPagesCount = var11 - var33; - if (GrandExchangeEvent.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - GrandExchangeEvent.worldSelectLeftSprite.drawAt(8, WorldMapData_1.canvasHeight / 2 - GrandExchangeEvent.worldSelectLeftSprite.subHeight / 2); - } - - if (class32.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - class32.worldSelectRightSprite.drawAt(Username.canvasWidth - class32.worldSelectRightSprite.subWidth - 8, WorldMapData_1.canvasHeight / 2 - class32.worldSelectRightSprite.subHeight / 2); - } - - int var12 = var38 + 23; - int var13 = var9 + Login.xPadding; - int var14 = 0; - boolean var15 = false; - int var16 = Login.worldSelectPage; - - int var17; - for (var17 = var6 * var16; var17 < World.World_count && var16 - Login.worldSelectPage < var33; ++var17) { - World var31 = class96.World_worlds[var17]; - boolean var19 = true; - String var20 = Integer.toString(var31.population); - if (var31.population == -1) { - var20 = "OFF"; - var19 = false; - } else if (var31.population > 1980) { - var20 = "FULL"; - var19 = false; - } - - int var22 = 0; - byte var21; - if (var31.isBeta()) { - if (var31.isMembersOnly()) { - var21 = 7; - } else { - var21 = 6; - } - } else if (var31.isDeadman()) { - var22 = 16711680; - if (var31.isMembersOnly()) { - var21 = 5; - } else { - var21 = 4; - } - } else if (var31.method1767()) { - if (var31.isMembersOnly()) { - var21 = 9; - } else { - var21 = 8; - } - } else if (var31.isPvp()) { - if (var31.isMembersOnly()) { - var21 = 3; - } else { - var21 = 2; - } - } else if (var31.isMembersOnly()) { - var21 = 1; - } else { - var21 = 0; - } - - if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var13 + var23 && MouseHandler.MouseHandler_y < var12 + var45 && var19) { - Login.hoveredWorldIndex = var17; - UserComparator6.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var12, 128, 16777215); - var15 = true; - } else { - UserComparator6.worldSelectBackSprites[var21].drawAt(var13, var12); - } - - if (ReflectionCheck.worldSelectFlagSprites != null) { - ReflectionCheck.worldSelectFlagSprites[(var31.isMembersOnly() ? 8 : 0) + var31.location].drawAt(var13 + 29, var12); - } - - var0.drawCentered(Integer.toString(var31.id), var13 + 15, var45 / 2 + var12 + 5, var22, -1); - var1.drawCentered(var20, var13 + 60, var45 / 2 + var12 + 5, 268435455, -1); - var12 = var12 + var37 + var45; - ++var14; - if (var14 >= var6) { - var12 = var38 + 23; - var13 = var13 + var23 + var26; - var14 = 0; - ++var16; - } - } - - if (var15) { - var17 = var1.stringWidth(class96.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var18 = var1.ascent + 8; - int var39 = MouseHandler.MouseHandler_y + 25; - if (var39 + var18 > 480) { - var39 = MouseHandler.MouseHandler_y - 25 - var18; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var18, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var18, 0); - var1.drawCentered(class96.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var39 + var1.ascent + 4, 0, -1); - } - } - - DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.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.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); - } - - String var25; - String var27; - short var40; - short var42; - if (Client.gameState == 20) { - ScriptFrame.titleboxSprite.drawAt(Login.loginBoxX + 180 - ScriptFrame.titleboxSprite.subWidth / 2, 271 - ScriptFrame.titleboxSprite.subHeight / 2); - var40 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var41 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var41, 16777215, 0); - var42 = 200; - - for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(0, var25.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var41, 16777215, 0); - var41 += 15; - - for (var27 = WorldMapSection2.method321(Login.Login_password); var0.stringWidth(var27) > var42; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27, Login.loginBoxX + 180 - 108, var41, 16777215, 0); - var41 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - ScriptFrame.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var5; - if (Login.loginIndex == 0) { - var40 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 30; - var24 = Login.loginBoxX + 180 - 80; - var5 = 291; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var40 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var40 = 201; - var0.drawCentered(Login.Login_response1, class96.loginBoxCenter, var40, 16776960, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, class96.loginBoxCenter, var41, 16776960, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, class96.loginBoxCenter, var41, 16776960, 0); - var41 += 15; - var41 += 7; - var0.draw("Login: ", class96.loginBoxCenter - 110, var41, 16777215, 0); - var42 = 200; - - for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), class96.loginBoxCenter - 70, var41, 16777215, 0); - var41 += 15; - - for (var27 = WorldMapSection2.method321(Login.Login_password); var0.stringWidth(var27) > var42; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), class96.loginBoxCenter - 108, var41, 16777215, 0); - var41 += 15; - var40 = 277; - var26 = class96.loginBoxCenter + -117; - IndexedSprite var28 = SecureRandomFuture.method2171(Client.Login_isUsernameRemembered, Login.field1183); - var28.drawAt(var26, var40); - var26 = var26 + var28.subWidth + 5; - var1.draw("Remember username", var26, var40 + 13, 16776960, 0); - var26 = class96.loginBoxCenter + 24; - var28 = SecureRandomFuture.method2171(WorldMapSection2.clientPreferences.hideUsername, Login.field1184); - var28.drawAt(var26, var40); - var26 = var26 + var28.subWidth + 5; - var1.draw("Hide username", var26, var40 + 13, 16776960, 0); - var41 = var40 + 15; - var9 = class96.loginBoxCenter - 80; - short var10 = 321; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); - var9 = class96.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); - var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); - var40 = 357; - switch(Login.field1193) { - case 2: - class14.field101 = "Having trouble logging in?"; - break; - default: - class14.field101 = "Can't login? Click here."; - } - - Login.field1175 = new Bounds(class96.loginBoxCenter, var40, var1.stringWidth(class14.field101), 11); - WorldMapCacheName.field315 = new Bounds(class96.loginBoxCenter, var40, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(class14.field101, class96.loginBoxCenter, var40, 16777215, 0); - } else if (Login.loginIndex == 3) { - var40 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var24 = Login.loginBoxX + 180; - var5 = 276; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180; - var5 = 326; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); - } else { - short var8; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var40 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var0.draw("PIN: " + WorldMapSection2.method321(LoginScreenAnimation.otp) + (Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var41, 16777215, 0); - var41 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var41, 16776960, 0); - var41 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var41, 16776960, 0); - var24 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var33 = var41 - var0.ascent; - IndexedSprite var44; - if (Login.field1185) { - var44 = DirectByteArrayCopier.options_buttons_2Sprite; - } else { - var44 = WorldMapSprite.options_buttons_0Sprite; - } - - var44.drawAt(var24, var33); - var41 += 15; - var26 = Login.loginBoxX + 180 - 80; - var8 = 321; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Continue", var26, var8 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Cancel", var26, var8 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var40 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var41 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var41, 16777215, 0); - var42 = 174; - - for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var41, 16777215, 0); - var41 += 15; - var6 = Login.loginBoxX + 180 - 80; - short var43 = 321; - Login.titlebuttonSprite.drawAt(var6 - 73, var43 - 20); - var0.drawCentered("Recover", var6, var43 + 5, 16777215, 0); - var6 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var6 - 73, var43 - 20); - var0.drawCentered("Back", var6, var43 + 5, 16777215, 0); - var43 = 356; - var1.drawCentered("Still having trouble logging in?", class96.loginBoxCenter, var43, 268435455, 0); - } else if (Login.loginIndex == 6) { - var40 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var24 = Login.loginBoxX + 180; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var40 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var40 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var40 = 201; - String var4 = ""; - var25 = ""; - var27 = ""; - switch(Login.field1165) { - case 0: - var4 = "Your account has been disabled."; - var25 = Strings.field3045; - var27 = ""; - break; - case 1: - var4 = "Account locked as we suspect it has been stolen."; - var25 = Strings.field2808; - var27 = ""; - break; - default: - ViewportMouse.Login_promptCredentials(false); - } - - var0.drawCentered(var4, Login.loginBoxX + 180, var40, 16776960, 0); - var41 = var40 + 15; - var2.drawCentered(var25, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var2.drawCentered(var27, Login.loginBoxX + 180, var41, 16776960, 0); - var41 += 15; - var26 = Login.loginBoxX + 180; - var8 = 276; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Support Page", var26, var8 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180; - var8 = 326; - Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); - var0.drawCentered("Back", var26, var8 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var40 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); - var41 = var40 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); - var41 += 15; - var24 = Login.loginBoxX + 180; - var5 = 301; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Ok", var24, var5 + 5, 16777215, 0); - } - } - } - - if (Client.gameState >= 10) { - int[] var3 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var3); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, WorldMapData_1.canvasHeight); - WorldMapLabelSize.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - WorldMapLabelSize.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var3); - } - - Login.title_muteSprite[WorldMapSection2.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == FriendLoginUpdate.clientLanguage) { - if (WorldMapDecorationType.field2739 != null) { - var41 = Login.xPadding + 5; - var42 = 463; - byte var36 = 100; - byte var34 = 35; - WorldMapDecorationType.field2739.drawAt(var41, var42); - var0.drawCentered("World" + " " + Client.worldId, var36 / 2 + var41, var34 / 2 + var42 - 2, 16777215, 0); - if (World.World_request != null) { - var1.drawCentered("Loading...", var36 / 2 + var41, var34 / 2 + var42 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var36 / 2 + var41, var34 / 2 + var42 + 12, 16777215, 0); - } - } else { - WorldMapDecorationType.field2739 = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.archive8, "sl_button", ""); - } - } - - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1157828358" - ) - static int method3608(int var0, Script var1, boolean var2) { - Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index d959aa69b5..a3f80786ab 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("ft") +@ObfuscatedName("ga") @Implements("Node") public class Node { - @ObfuscatedName("ci") + @ObfuscatedName("ct") @Export("key") public long key; - @ObfuscatedName("ca") + @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("previous") public Node previous; - @ObfuscatedName("cc") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("next") public Node next; - @ObfuscatedName("fz") + @ObfuscatedName("fd") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fj") + @ObfuscatedName("fo") @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 df52270398..da06c33be7 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("jw") +@ObfuscatedName("jh") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lft;)V" + signature = "(Lga;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lft;)V" + signature = "(Lga;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lft;Lft;)V" + signature = "(Lga;Lga;)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 bf64f0fc2e..2a81c0a0e6 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("ln") +@ObfuscatedName("lv") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("size") int size; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lft;" + signature = "[Lga;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lga;" ) @Export("current") Node current; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(J)Lft;" + signature = "(J)Lga;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lft;J)V" + signature = "(Lga;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lft;" + signature = "()Lga;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index a491c58219..0ebeb40f31 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -3,258 +3,259 @@ 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("ir") +@ObfuscatedName("jw") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("ObjectDefinition_isLowDetail") - public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("t") + static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("ObjectDefinition_archive") - public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("ObjectDefinition_modelsArchive") - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("e") + static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ObjectDefinition_cached") - public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("i") + static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ObjectDefinition_cachedEntities") - public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("d") + static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ObjectDefinition_cachedModels") - public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("l") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Ldg;" + signature = "[Lea;" ) - static ModelData[] field3350; - @ObfuscatedName("j") + static ModelData[] field3376; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2072131509 + intValue = -1540034327 ) @Export("id") public int id; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("modelIds") int[] modelIds; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("models") int[] models; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1829764731 + intValue = 907984177 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -494400193 + intValue = 840243271 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1227717711 + intValue = 969965047 ) @Export("interactType") public int interactType; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1341583163 + intValue = -1367724563 ) @Export("int1") public int int1; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 488634624 + intValue = -1336003431 ) @Export("clipType") int clipType; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -634385779 + intValue = -450300581 ) @Export("animationId") public int animationId; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2070397181 + intValue = -84642935 ) @Export("int2") public int int2; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1331237225 + intValue = -1160377515 ) @Export("ambient") int ambient; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1829035153 + intValue = -1766971271 ) @Export("contrast") int contrast; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("actions") public String[] actions; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1312514055 + intValue = -481571835 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -649237353 + intValue = -337227603 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("clipped") public boolean clipped; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1009238409 + intValue = -878255357 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -2029101183 + intValue = -344043167 ) @Export("modelHeight") int modelHeight; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1016061481 + intValue = 710022213 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 71581615 + intValue = 720076445 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1543134169 + intValue = -278523345 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 2126649085 + intValue = 1100577685 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("boolean2") public boolean boolean2; @ObfuscatedName("av") @Export("isSolid") boolean isSolid; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 605311825 + intValue = -1270005767 ) @Export("int3") public int int3; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @Export("transforms") public int[] transforms; - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1009717649 + intValue = 1641253039 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ao") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1539805801 + intValue = -948693409 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1082211877 + intValue = 1264376143 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1026380067 + intValue = -1413235621 ) @Export("int4") public int int4; - @ObfuscatedName("ag") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1425123591 + intValue = 1914618679 ) @Export("int5") public int int5; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1479787487 + intValue = -279261471 ) @Export("int6") public int int6; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -265,7 +266,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3350 = new ModelData[4]; + field3376 = new ModelData[4]; } ObjectDefinition() { @@ -275,7 +276,7 @@ public class ObjectDefinition extends DualNode { this.interactType = 2; this.boolean1 = true; this.int1 = -1; - this.clipType = -256; + this.clipType = -1; this.nonFlatShading = false; this.modelClipped = false; this.animationId = -1; @@ -304,10 +305,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "40" + signature = "(I)V", + garbageValue = "-720129530" ) @Export("postDecode") void postDecode() { @@ -330,10 +331,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-647574663" + signature = "(Lkb;I)V", + garbageValue = "680070630" ) @Export("decode") void decode(Buffer var1) { @@ -347,10 +348,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "-47" + signature = "(Lkb;II)V", + garbageValue = "1616364474" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -481,11 +482,11 @@ public class ObjectDefinition extends DualNode { this.soundEffectIds[var4] = var1.readUnsignedShort(); } } else if (var2 == 81) { - this.clipType = var1.readUnsignedByte() * 65536; + this.clipType = var1.readUnsignedByte() * 256; } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = MouseRecorder.readStringIntParameters(var1, this.params); + this.params = NetCache.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -521,12 +522,12 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "428047551" + garbageValue = "54022350" ) - public final boolean method4675(int var1) { + public final boolean method4661(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -550,10 +551,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1267876034" + signature = "(B)Z", + garbageValue = "53" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -570,10 +571,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II[[IIIII)Leq;", - garbageValue = "2062511915" + signature = "(II[[IIIII)Lee;", + garbageValue = "-557802915" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -604,24 +605,24 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2845(); + var9 = ((ModelData)var9).method2885(); } - if (this.clipType * 256 >= 0) { + if (this.clipType >= 0) { if (var9 instanceof Model) { - var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 256); + var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2838(var3, var4, var5, var6, true, this.clipType * 256); + var9 = ((ModelData)var9).method2886(var3, var4, var5, var6, true, this.clipType); } } return (Entity)var9; } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II[[IIIII)Ldx;", - garbageValue = "-463745511" + signature = "(II[[IIIII)Lel;", + garbageValue = "1873775908" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -643,17 +644,17 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModels.put(var9, var7); } - if (this.clipType * 256 >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 256); + if (this.clipType >= 0) { + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); } return var9; } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II[[IIIILip;IB)Ldx;", - garbageValue = "1" + signature = "(II[[IIIILjc;IS)Lel;", + garbageValue = "255" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -675,7 +676,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModels.put(var11, var9); } - if (var7 == null && this.clipType * 256 == -1) { + if (var7 == null && this.clipType == -1) { return var11; } else { if (var7 != null) { @@ -684,18 +685,18 @@ public class ObjectDefinition extends DualNode { var11 = var11.toSharedSequenceModel(true); } - if (this.clipType * 256 >= 0) { - var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256); + if (this.clipType >= 0) { + var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } return var11; } } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(III)Ldg;", - garbageValue = "-220875015" + signature = "(III)Lea;", + garbageValue = "179271223" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -733,19 +734,19 @@ public class ObjectDefinition extends DualNode { } if (var4) { - var3.method2854(); + var3.method2895(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3350[var6] = var3; + field3376[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3350, var5); + var3 = new ModelData(field3376, var5); } } else { int var9 = -1; @@ -775,7 +776,7 @@ public class ObjectDefinition extends DualNode { } if (var10) { - var3.method2854(); + var3.method2895(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -797,17 +798,17 @@ public class ObjectDefinition extends DualNode { ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); if (var1 == 4 && var2 > 3) { - var8.method2850(256); + var8.method2891(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method2862(); + var8.method2888(); } else if (var2 == 2) { - var8.method2848(); + var8.method2889(); } else if (var2 == 3) { - var8.method2903(); + var8.method2910(); } if (this.recolorFrom != null) { @@ -835,14 +836,14 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lir;", - garbageValue = "-211089753" + signature = "(S)Ljw;", + garbageValue = "128" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); + var1 = Projectile.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -854,13 +855,13 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Occluder.getObjectDefinition(var2) : null; + return var2 != -1 ? WorldMapSection2.getObjectDefinition(var2) : null; } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1049536476" + signature = "(IIB)I", + garbageValue = "-99" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -880,20 +881,20 @@ public class ObjectDefinition extends DualNode { return var3; } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "162927924" + garbageValue = "-1816202472" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorDecoration.method2914(this.params, var1, var2); + return class9.method122(this.params, var1, var2); } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "143000287" + garbageValue = "1998255719" ) @Export("hasSound") public boolean hasSound() { @@ -902,7 +903,7 @@ public class ObjectDefinition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectDefinition var2 = Occluder.getObjectDefinition(this.transforms[var1]); + ObjectDefinition var2 = WorldMapSection2.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -912,4 +913,175 @@ 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 1cc7951dcb..b5b460e107 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("fy") +@ObfuscatedName("gw") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @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 c485935123..d1ee85b313 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,87 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("cm") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1573103385 - ) - @Export("plane") - int plane; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1434930617 - ) - @Export("x") - int x; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1295537280 + intValue = 1413400591 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 393514941 + intValue = 1795590701 ) - int field1069; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -840891776 - ) - int field1080; + @Export("plane") + int plane; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 210061871 + intValue = -877292205 ) - int field1070; - @ObfuscatedName("l") + @Export("x") + int x; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2754531 + intValue = 1466364365 + ) + int field1110; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -878503687 + ) + int field1100; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 2082519321 + ) + int field1106; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1984124175 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lde;" + signature = "Ldy;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1469470179 + intValue = -240636841 ) - int field1074; + int field1104; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -901475347 + ) + int field1105; @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1106113547 - ) - int field1075; - @ObfuscatedName("h") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -52141537 - ) - int field1077; @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1043802301 + ) + int field1107; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lde;" + signature = "Ldy;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lir;" + signature = "Ljw;" ) @Export("obj") ObjectDefinition obj; @@ -96,10 +96,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-280548434" + signature = "(B)V", + garbageValue = "29" ) @Export("set") void set() { @@ -107,119 +107,37 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1070 = var2.int4 * 128; - this.field1074 = var2.int5; - this.field1075 = var2.int6; + this.field1106 = var2.int4 * 128; + this.field1104 = var2.int5; + this.field1105 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1070 = 0; - this.field1074 = 0; - this.field1075 = 0; + this.field1106 = 0; + this.field1104 = 0; + this.field1105 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - class2.pcmStreamMixer.removeSubStream(this.stream1); + Tiles.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIILir;II)V", - garbageValue = "1319023386" + signature = "(II)I", + garbageValue = "-1791981608" ) - static void method1931(int var0, int var1, int var2, ObjectDefinition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 16384; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; + @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; } - - var5.field1069 = (var6 + var1) * 128; - var5.field1080 = (var7 + var2) * 16384; - var5.soundEffectId = var3.ambientSoundId; - var5.field1070 = var3.int4 * 128; - var5.field1074 = var3.int5; - var5.field1075 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field1077 = var5.field1074 + (int)(Math.random() * (double)(var5.field1075 - var5.field1074)); - } - - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "1" - ) - public static void method1933(int var0) { - if (var0 != -1) { - if (class197.Widget_loadedInterfaces[var0]) { - class197.Widget_archive.clearFilesGroup(var0); - if (WorldMapLabel.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; - - for (int var2 = 0; var2 < WorldMapLabel.Widget_interfaceComponents[var0].length; ++var2) { - if (WorldMapLabel.Widget_interfaceComponents[var0][var2] != null) { - if (WorldMapLabel.Widget_interfaceComponents[var0][var2].type != 2) { - WorldMapLabel.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } - } - } - - if (var1) { - WorldMapLabel.Widget_interfaceComponents[var0] = null; - } - - class197.Widget_loadedInterfaces[var0] = false; - } - } - } - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1074092886" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - static void method1934() { - if (class218.field2716 != null) { - Client.field888 = Client.cycle; - class218.field2716.method4395(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - class218.field2716.method4408(Messages.baseX * 64 + (Client.players[var0].x >> 7), Language.baseY * 64 + (Client.players[var0].y >> 7)); - } - } - } - } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index b27901b2a9..d20a969d2b 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,153 +1,182 @@ +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("er") +@ObfuscatedName("em") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1590617607 + intValue = -1489465753 ) @Export("minTileX") int minTileX; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -547083531 + intValue = -252661799 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -50213873 + intValue = -1056714957 ) @Export("minTileY") int minTileY; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 468551341 + intValue = -1875839743 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1458013883 + intValue = -1984874267 ) @Export("type") int type; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1331967011 + intValue = 1069465565 ) @Export("minX") int minX; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -455782375 + intValue = -1744424635 ) @Export("maxX") int maxX; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 819505963 + intValue = -104326363 ) @Export("minZ") int minZ; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1618672975 + intValue = -470429171 ) @Export("maxZ") int maxZ; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1033011613 + intValue = 2023575959 ) @Export("minY") int minY; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1435330577 + intValue = 1540730751 ) @Export("maxY") int maxY; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 681234965 + intValue = 223971517 ) - int field1891; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 460124457 - ) - int field1900; + int field1916; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -947874837 + intValue = 1903761875 ) - int field1901; - @ObfuscatedName("x") + int field1917; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1101467095 + intValue = 2065104463 ) - int field1903; - @ObfuscatedName("w") + int field1914; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1920736103 + intValue = 213261407 ) - int field1904; - @ObfuscatedName("k") + int field1920; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1277839357 + intValue = 1460776299 ) - int field1889; - @ObfuscatedName("q") + int field1908; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 461878441 + intValue = 1267954519 ) - int field1905; + int field1921; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1266608785 + ) + int field1922; Occluder() { } - @ObfuscatedName("c") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(IB)Lir;", - garbageValue = "-54" + signature = "(Lfs;III)Ldw;", + garbageValue = "2138193849" ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + 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 { - 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; + throw new IllegalArgumentException(); } } - @ObfuscatedName("c") + @ObfuscatedName("lc") @ObfuscatedSignature( - signature = "(I)[Lgb;", - garbageValue = "1401703013" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "880911904" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2127, ServerPacket.field2129, ServerPacket.field2168, ServerPacket.field2118, ServerPacket.field2119, ServerPacket.field2120, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2123, ServerPacket.field2124, ServerPacket.field2159, ServerPacket.field2126, ServerPacket.field2165, ServerPacket.field2145, ServerPacket.field2200, ServerPacket.field2169, ServerPacket.field2131, ServerPacket.field2132, ServerPacket.field2117, ServerPacket.field2134, ServerPacket.field2135, ServerPacket.field2136, ServerPacket.field2137, ServerPacket.field2138, ServerPacket.field2139, ServerPacket.field2140, ServerPacket.field2141, ServerPacket.field2142, ServerPacket.field2181, ServerPacket.field2151, ServerPacket.field2173, ServerPacket.field2146, ServerPacket.field2178, ServerPacket.field2183, ServerPacket.field2172, ServerPacket.field2150, ServerPacket.field2148, ServerPacket.field2152, ServerPacket.field2153, ServerPacket.field2125, ServerPacket.field2143, ServerPacket.field2116, ServerPacket.field2157, ServerPacket.field2144, ServerPacket.field2115, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2149, ServerPacket.field2163, ServerPacket.field2164, ServerPacket.field2133, ServerPacket.field2166, ServerPacket.field2128, ServerPacket.field2156, ServerPacket.field2162, ServerPacket.field2155, ServerPacket.field2171, ServerPacket.field2193, ServerPacket.field2167, ServerPacket.field2174, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2154, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2158, ServerPacket.field2182, ServerPacket.field2130, ServerPacket.field2184, ServerPacket.field2187, ServerPacket.field2186, ServerPacket.field2147, ServerPacket.field2188, ServerPacket.field2189, ServerPacket.field2190, ServerPacket.field2191, ServerPacket.field2192, ServerPacket.field2170, ServerPacket.field2194, ServerPacket.field2195, ServerPacket.field2196, ServerPacket.field2197, ServerPacket.field2198, ServerPacket.field2199, ServerPacket.field2185}; + 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 855132456a..ff39804e3b 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("ks") +@ObfuscatedName("kj") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("t") - static final int[] field3700; - @ObfuscatedName("c") + @ObfuscatedName("m") + static final int[] field3707; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llw;" + signature = "Llp;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 929089357 + intValue = -2144680439 ) @Export("bitIndex") int bitIndex; static { - field3700 = 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}; + 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}; } public PacketBuffer(int var1) { super(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "17531083" + garbageValue = "-1491722671" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Llw;I)V", - garbageValue = "-1301005678" + signature = "(Llp;I)V", + garbageValue = "452312441" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2035139507" + garbageValue = "-407468573" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2077105215" + garbageValue = "-1676648466" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "106" + garbageValue = "36" ) - public boolean method5539() { - int var1 = super.array[super.offset] - this.isaacCipher.method6307() & 255; + public boolean method5524() { + int var1 = super.array[super.offset] - this.isaacCipher.method6364() & 255; return var1 >= 128; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1485152943" + garbageValue = "787135806" ) @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("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1172597525" + garbageValue = "330744535" ) - public void method5525(byte[] var1, int var2, int var3) { + public void method5516(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("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "109" + garbageValue = "-6" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "7617" + signature = "(IB)I", + garbageValue = "-43" ) @Export("readBits") public int readBits(int var1) { @@ -125,36 +125,425 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3700[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3707[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3700[var3]; + var4 += super.array[var2] & field3707[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3700[var1]; + var4 += super.array[var2] >> var3 - var1 & field3707[var1]; } return var4; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "74" + signature = "(I)V", + garbageValue = "931642026" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "2094986039" + signature = "(IB)I", + garbageValue = "0" ) @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 = class51.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 = class51.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 = class51.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 = class51.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 = class51.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 = class51.field404[var0][var1]; + var10000[var2] |= 585; + var10000 = class51.field404[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = class51.field404[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = class51.field404[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = class51.field404[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = class51.field404[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = class51.field404[var0][var1]; + var10000[var2] |= 1170; + var10000 = class51.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 41b4a81e2f..a42dd91195 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -3,44 +3,55 @@ 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("gs") +@ObfuscatedName("gq") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lgs;" + signature = "[Lgq;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1322970171 + intValue = 1377216057 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgi;" + signature = "[Lms;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("lc") + @ObfuscatedGetter( + intValue = 1185326295 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgn;" ) @Export("clientPacket") public ClientPacket clientPacket; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 631809601 + intValue = 1271614463 ) @Export("clientPacketLength") public int clientPacketLength; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lks;" + signature = "Lkj;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1165954463 + intValue = -1670678783 ) @Export("index") public int index; @@ -53,10 +64,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "660241360" + garbageValue = "-1494953808" ) @Export("release") public void release() { @@ -65,66 +76,54 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lis;", - garbageValue = "-694311044" + signature = "(III)I", + garbageValue = "1872697875" ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @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 { - 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; + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } } - @ObfuscatedName("t") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)Lim;", - garbageValue = "1232972358" + signature = "(II)I", + garbageValue = "-1384794944" ) - @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("v") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1259067102" - ) - static int method3697(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } + + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; + } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; + } + + return var0 + var1; } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 0a47735dd1..282bd4e623 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,91 +5,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("dv") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("or") - @ObfuscatedSignature( - signature = "Lfi;" + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 2038642023 ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("c") + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkr;" + signature = "Llt;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljm;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1477926037 + intValue = -1977656589 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lkb;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llw;" + signature = "Llp;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lks;" + signature = "Lkj;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -184650797 + intValue = -1499666993 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("j") - boolean field1301; - @ObfuscatedName("m") + @ObfuscatedName("t") + boolean field1335; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1725214527 + intValue = 1899399217 ) - int field1299; - @ObfuscatedName("p") + int field1338; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1544276091 + intValue = -1748299909 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - ServerPacket field1309; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgb;" - ) - ServerPacket field1305; + ServerPacket field1334; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - ServerPacket field1307; + ServerPacket field1329; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgv;" + ) + ServerPacket field1339; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -98,15 +98,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1301 = true; - this.field1299 = 0; + this.field1335 = true; + this.field1338 = 0; this.pendingWrites = 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-10" + signature = "(I)V", + garbageValue = "1731012634" ) @Export("clearBuffer") final void clearBuffer() { @@ -114,10 +114,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1781270612" + garbageValue = "-2069512411" ) @Export("flush") final void flush() throws IOException { @@ -142,10 +142,10 @@ public class PacketWriter { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lgs;I)V", - garbageValue = "1684104708" + signature = "(Lgq;I)V", + garbageValue = "348040455" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -155,20 +155,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkr;I)V", - garbageValue = "1771129210" + signature = "(Llt;B)V", + garbageValue = "-28" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "711577469" + garbageValue = "955020520" ) @Export("close") void close() { @@ -179,54 +179,72 @@ public class PacketWriter { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-91" + garbageValue = "-17" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Lkr;", - garbageValue = "106" + signature = "(I)Llt;", + garbageValue = "1352632931" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IS)Liy;", - garbageValue = "-7105" + signature = "(II)I", + garbageValue = "-816734320" ) - public static HealthBarDefinition method2329(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)); - } + public static int method2376(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; + } - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - 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; + } + } } } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "16" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 39d01bea1f..a75d8bed27 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -7,31 +7,31 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("is") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("ParamDefinition_archive") public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("ParamDefinition_cached") - static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("o") + public static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("k") @Export("type") char type; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2044093609 + intValue = 493165411 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("autoDisable") boolean autoDisable; @@ -43,19 +43,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2127914016" + signature = "(B)V", + garbageValue = "65" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "-2" + signature = "(Lkb;I)V", + garbageValue = "1593854390" ) @Export("decode") void decode(Buffer var1) { @@ -69,15 +69,15 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-372343900" + signature = "(Lkb;II)V", + garbageValue = "-1589952103" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = ServerBuild.method4209(var1.readByte()); + this.type = class236.method4223(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -88,10 +88,10 @@ public class ParamDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1143023141" + garbageValue = "861109850" ) @Export("isString") public boolean isString() { diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 861a18aac9..fafb486353 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,3 +1,4 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -7,201 +8,209 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dw") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 565160271 + intValue = 1186957939 ) - public static int field1398; - @ObfuscatedName("g") + public static int field1421; + @ObfuscatedName("v") @Export("PcmPlayer_stereo") protected static boolean PcmPlayer_stereo; - @ObfuscatedName("v") + @ObfuscatedName("z") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 964748607 + ) + static int field1423; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lcx;" + signature = "Ldg;" ) @Export("pcmPlayerProvider") - static class99 pcmPlayerProvider; - @ObfuscatedName("n") + static class108 pcmPlayerProvider; + @ObfuscatedName("u") @Export("samples") protected int[] samples; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Ldn;" + signature = "Lds;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1255248085 + intValue = -1104250369 ) - int field1397; - @ObfuscatedName("k") + int field1433; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -2367758414961315653L + longValue = -5529745032621792639L ) @Export("timeMs") long timeMs; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1798201523 + intValue = 1410666215 ) @Export("capacity") int capacity; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1072458633 - ) - int field1401; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -247116181 - ) - int field1403; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -3370414855018982157L - ) - long field1396; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 3489373 + intValue = -1563986159 ) - int field1404; + int field1431; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1383720405 + ) + int field1432; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -92983435 + longValue = 8518304347901097889L ) - int field1405; - @ObfuscatedName("s") + long field1441; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -658746403 + intValue = -2057730941 ) - int field1406; - @ObfuscatedName("a") + int field1436; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -227900645038569121L + intValue = -1413544229 ) - long field1407; - @ObfuscatedName("u") - boolean field1408; - @ObfuscatedName("au") + int field1435; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 858322217 + intValue = 1350082309 ) - int field1409; - @ObfuscatedName("ay") + int field1428; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = -7306304429594816925L + ) + long field1424; + @ObfuscatedName("f") + boolean field1438; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -91931307 + ) + int field1439; + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "[Ldn;" + signature = "[Lds;" ) - PcmStream[] field1410; - @ObfuscatedName("aa") + PcmStream[] field1440; + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "[Ldn;" + signature = "[Lds;" ) - PcmStream[] field1411; + PcmStream[] field1434; protected PcmPlayer() { - this.field1397 = 32; - this.timeMs = WorldMapIcon_0.currentTimeMillis(); - this.field1396 = 0L; - this.field1404 = 0; - this.field1405 = 0; - this.field1406 = 0; - this.field1407 = 0L; - this.field1408 = true; - this.field1409 = 0; - this.field1410 = new PcmStream[8]; - this.field1411 = new PcmStream[8]; + this.field1433 = 32; + this.timeMs = class217.currentTimeMillis(); + this.field1441 = 0L; + 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]; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-111" + signature = "(I)V", + garbageValue = "-515177845" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-871749312" + garbageValue = "-1831392073" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-164846701" + garbageValue = "-1722515255" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1942741652" + signature = "(B)V", + garbageValue = "-100" ) @Export("close") protected void close() { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2088617942" + garbageValue = "-801705902" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ldn;I)V", - garbageValue = "1817340933" + signature = "(Lds;I)V", + garbageValue = "1722615809" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1301441901" + signature = "(B)V", + garbageValue = "53" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = WorldMapIcon_0.currentTimeMillis(); + long var1 = class217.currentTimeMillis(); try { - if (0L != this.field1396) { - if (var1 < this.field1396) { + if (0L != this.field1441) { + if (var1 < this.field1441) { return; } this.open(this.capacity); - this.field1396 = 0L; - this.field1408 = true; + this.field1441 = 0L; + this.field1438 = true; } int var3 = this.position(); - if (this.field1406 - var3 > this.field1404) { - this.field1404 = this.field1406 - var3; + if (this.field1428 - var3 > this.field1436) { + this.field1436 = this.field1428 - var3; } - int var4 = this.field1401 + this.field1403; + int var4 = this.field1431 + this.field1432; if (var4 + 256 > 16384) { var4 = 16128; } @@ -215,10 +224,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field1408 = true; + this.field1438 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field1403 = var4 - this.field1401; + this.field1432 = var4 - this.field1431; } } @@ -228,38 +237,38 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field1407) { - if (!this.field1408) { - if (this.field1404 == 0 && this.field1405 == 0) { + if (var1 > this.field1424) { + if (!this.field1438) { + if (this.field1436 == 0 && this.field1435 == 0) { this.close(); - this.field1396 = 2000L + var1; + this.field1441 = var1 + 2000L; return; } - this.field1403 = Math.min(this.field1405, this.field1404); - this.field1405 = this.field1404; + this.field1432 = Math.min(this.field1435, this.field1436); + this.field1435 = this.field1436; } else { - this.field1408 = false; + this.field1438 = false; } - this.field1404 = 0; - this.field1407 = 2000L + var1; + this.field1436 = 0; + this.field1424 = 2000L + var1; } - this.field1406 = var3; + this.field1428 = var3; } catch (Exception var7) { this.close(); - this.field1396 = var1 + 2000L; + this.field1441 = 2000L + var1; } try { - if (var1 > this.timeMs + 500000L) { + if (var1 > 500000L + this.timeMs) { var1 = this.timeMs; } while (var1 > 5000L + this.timeMs) { this.skip(256); - this.timeMs += (long)(256000 / field1398); + this.timeMs += (long)(256000 / field1421); } } catch (Exception var6) { this.timeMs = var1; @@ -268,57 +277,57 @@ public class PcmPlayer { } } - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-569274041" + garbageValue = "-1215131222" ) - public final void method2489() { - this.field1408 = true; + public final void method2537() { + this.field1438 = true; } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2064649037" + signature = "(S)V", + garbageValue = "255" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1408 = true; + this.field1438 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1396 = WorldMapIcon_0.currentTimeMillis() + 2000L; + this.field1441 = class217.currentTimeMillis() + 2000L; } } - @ObfuscatedName("aa") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1437480002" + garbageValue = "-1390717833" ) @Export("shutdown") public final synchronized void shutdown() { - if (UserComparator2.soundSystem != null) { + if (class332.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == UserComparator2.soundSystem.players[var2]) { - UserComparator2.soundSystem.players[var2] = null; + if (this == class332.soundSystem.players[var2]) { + class332.soundSystem.players[var2] = null; } - if (UserComparator2.soundSystem.players[var2] != null) { + if (class332.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - Frames.soundSystemExecutor.shutdownNow(); - Frames.soundSystemExecutor = null; - UserComparator2.soundSystem = null; + soundSystemExecutor.shutdownNow(); + soundSystemExecutor = null; + class332.soundSystem = null; } } @@ -326,16 +335,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("aq") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "6" + signature = "(II)V", + garbageValue = "-1537467116" ) @Export("skip") final void skip(int var1) { - this.field1409 -= var1; - if (this.field1409 < 0) { - this.field1409 = 0; + this.field1439 -= var1; + if (this.field1439 < 0) { + this.field1439 = 0; } if (this.stream != null) { @@ -344,7 +353,7 @@ public class PcmPlayer { } - @ObfuscatedName("as") + @ObfuscatedName("au") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; @@ -352,12 +361,12 @@ public class PcmPlayer { var3 = var2 << 1; } - class301.clearIntArray(var1, 0, var3); - this.field1409 -= var2; - if (this.stream != null && this.field1409 <= 0) { - this.field1409 += field1398 >> 4; - class65.PcmStream_disable(this.stream); - this.method2494(this.stream, this.stream.vmethod2777()); + 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()); int var4 = 0; int var5 = 255; @@ -379,7 +388,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field1410[var7]; + PcmStream var11 = this.field1440[var7]; label98: while (true) { @@ -395,33 +404,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod3965(); + int var13 = var11.vmethod3984(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field1397) { + if (var4 >= this.field1433) { break label104; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field1478; var14 != null; var14 = var11.nextSubStream()) { - this.method2494(var14, var15 * var14.vmethod2777() >> 8); + for (int var15 = var11.field1507; var14 != null; var14 = var11.nextSubStream()) { + this.method2571(var14, var15 * var14.vmethod2820() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field1410[var7] = var18; + this.field1440[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field1411[var7] = var10; + this.field1434[var7] = var10; } var11 = var18; @@ -436,9 +445,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1410[var6]; - PcmStream[] var17 = this.field1410; - this.field1411[var6] = null; + PcmStream var16 = this.field1440[var6]; + PcmStream[] var17 = this.field1440; + this.field1434[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -447,71 +456,42 @@ public class PcmPlayer { } } - if (this.field1409 < 0) { - this.field1409 = 0; + if (this.field1439 < 0) { + this.field1439 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = WorldMapIcon_0.currentTimeMillis(); + this.timeMs = class217.currentTimeMillis(); } - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Ldn;II)V", - garbageValue = "-1216223626" + signature = "(Lds;II)V", + garbageValue = "2093201048" ) - final void method2494(PcmStream var1, int var2) { + final void method2571(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1411[var3]; + PcmStream var4 = this.field1434[var3]; if (var4 == null) { - this.field1410[var3] = var1; + this.field1440[var3] = var1; } else { var4.after = var1; } - this.field1411[var3] = var1; - var1.field1478 = var2; + this.field1434[var3] = var1; + var1.field1507 = var2; } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-526155431" + signature = "(CI)Z", + garbageValue = "210668082" ) - @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; - Interpreter.sortWorlds(class96.World_worlds, 0, class96.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - signature = "(Lhn;I)Ljava/lang/String;", - garbageValue = "-1826088891" - ) - static String method2542(Widget var0) { - if (class83.method2108(WorldMapIcon_0.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index aa1c9ceaf6..f176333015 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("dn") +@ObfuscatedName("ds") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ldn;" + signature = "Lds;" ) @Export("after") PcmStream after; - @ObfuscatedName("q") - int field1478; - @ObfuscatedName("z") + @ObfuscatedName("a") + int field1507; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Ldd;" + signature = "Ldf;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("l") - protected abstract int vmethod3965(); + @ObfuscatedName("z") + protected abstract int vmethod3984(); - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ag") - int vmethod2777() { + @ObfuscatedName("ac") + int vmethod2820() { return 255; } - @ObfuscatedName("fs") + @ObfuscatedName("fk") @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 3303d2cf3a..241eea4de5 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("ch") +@ObfuscatedName("dz") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) - NodeDeque field1327; - @ObfuscatedName("o") - int field1329; - @ObfuscatedName("e") - int field1328; + NodeDeque field1357; + @ObfuscatedName("k") + int field1358; + @ObfuscatedName("d") + int field1355; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1327 = new NodeDeque(); - this.field1329 = 0; - this.field1328 = -1; + this.field1357 = new NodeDeque(); + this.field1358 = 0; + this.field1355 = -1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldn;)V" + signature = "(Lds;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldn;)V" + signature = "(Lds;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("o") - void method2352() { - if (this.field1329 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1327.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1327.previous()) { - var1.field1435 -= this.field1329; + @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; } - this.field1328 -= this.field1329; - this.field1329 = 0; + this.field1355 -= this.field1358; + this.field1358 = 0; } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lft;Ldi;)V" + signature = "(Lga;Ldo;)V" ) - void method2353(Node var1, PcmStreamMixerListener var2) { - while (this.field1327.sentinel != var1 && ((PcmStreamMixerListener)var1).field1435 <= var2.field1435) { + void method2402(Node var1, PcmStreamMixerListener var2) { + while (this.field1357.sentinel != var1 && ((PcmStreamMixerListener)var1).field1466 <= var2.field1466) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1328 = ((PcmStreamMixerListener)this.field1327.sentinel.previous).field1435; + this.field1355 = ((PcmStreamMixerListener)this.field1357.sentinel.previous).field1466; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ldi;)V" + signature = "(Ldo;)V" ) - void method2354(PcmStreamMixerListener var1) { + void method2403(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field1327.sentinel.previous; - if (var2 == this.field1327.sentinel) { - this.field1328 = -1; + Node var2 = this.field1357.sentinel.previous; + if (var2 == this.field1357.sentinel) { + this.field1355 = -1; } else { - this.field1328 = ((PcmStreamMixerListener)var2).field1435; + this.field1355 = ((PcmStreamMixerListener)var2).field1466; } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("l") - protected int vmethod3965() { + @ObfuscatedName("z") + protected int vmethod3984() { return 0; } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1328 < 0) { + if (this.field1355 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1329 < this.field1328) { - this.field1329 += var3; + if (var3 + this.field1358 < this.field1355) { + this.field1358 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1328 - this.field1329; + int var4 = this.field1355 - this.field1358; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1329 += var4; - this.method2352(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1327.last(); + this.field1358 += var4; + this.method2401(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1357.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1435 = 0; - this.method2354(var5); + var5.field1466 = 0; + this.method2403(var5); } else { - var5.field1435 = var7; - this.method2353(var5.previous, var5); + var5.field1466 = var7; + this.method2402(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1328 < 0) { + if (this.field1355 < 0) { this.skipSubStreams(var1); return; } - if (this.field1329 + var1 < this.field1328) { - this.field1329 += var1; + if (this.field1358 + var1 < this.field1355) { + this.field1358 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1328 - this.field1329; + int var2 = this.field1355 - this.field1358; this.skipSubStreams(var2); var1 -= var2; - this.field1329 += var2; - this.method2352(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1327.last(); + this.field1358 += var2; + this.method2401(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1357.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1435 = 0; - this.method2354(var3); + var3.field1466 = 0; + this.method2403(var3); } else { - var3.field1435 = var5; - this.method2353(var3.previous, var3); + var3.field1466 = var5; + this.method2402(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 26dc054880..d7eb2333a7 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("di") +@ObfuscatedName("do") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("c") - int field1435; + @ObfuscatedName("x") + int field1466; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("remove2") abstract void remove2(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lch;)I" + signature = "(Ldz;)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 9b953d8f66..c90f74a2a8 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -4,87 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bw") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("sx") - @ObfuscatedSignature( - signature = "Ld;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("hu") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1923954935 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1349370787 - ) - @Export("plane") - int plane; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 304063961 - ) - @Export("type") - int type; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -340804777 - ) - @Export("x") - int x; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1612075495 + intValue = -1216764751 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1762819513 + intValue = -1571459421 + ) + @Export("plane") + int plane; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1864356937 + ) + @Export("type") + int type; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1344797441 + ) + @Export("x") + int x; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1245486001 ) @Export("objectId") int objectId; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 51558137 + intValue = -547933481 ) - int field935; - @ObfuscatedName("d") + int field968; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1078181875 + intValue = 1800022501 ) - int field924; - @ObfuscatedName("l") + int field963; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 869281397 + intValue = 1336190783 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -186510347 + intValue = 1244443099 ) @Export("orientation") int orientation; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1858623199 + intValue = -668527737 ) - int field933; - @ObfuscatedName("p") + int field967; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -260343907 + intValue = -297028933 ) @Export("delay") int delay; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1816335395 + intValue = 718779675 ) @Export("hitpoints") int hitpoints; @@ -94,28 +82,34 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Llt;", - garbageValue = "-728987489" + signature = "(B)V", + garbageValue = "-42" ) - static Sprite method1738() { - Sprite var0 = new Sprite(); - var0.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var0.height = class326.SpriteBuffer_spriteHeight; - var0.xOffset = Huffman.SpriteBuffer_xOffsets[0]; - var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; - var0.subWidth = class326.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class326.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subWidth * var0.subHeight; - byte[] var2 = class326.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; + static void method1840() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class326.SpriteBuffer_spritePalette[var2[var3] & 255]; - } + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(II)Lby;", + garbageValue = "755627010" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } - DynamicObject.method2292(); - return var0; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "287596023" + ) + public static void method1838() { + ObjectDefinition.ObjectDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); + ObjectDefinition.ObjectDefinition_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index efbba6f3de..ceea74c7c3 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,188 +4,193 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("mq") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ay") + @ObfuscatedName("gd") @ObfuscatedGetter( - intValue = 673816071 + intValue = -610946691 ) - int field3911; - @ObfuscatedName("aa") - boolean field3904; - @ObfuscatedName("aq") + static int field3959; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1159209885 + intValue = 47209177 ) - int field3913; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 2116751685 - ) - int field3914; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -1612963129 - ) - int field3915; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = -544797125 - ) - int field3916; - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = 1024722961 - ) - int field3917; - @ObfuscatedName("ar") - boolean field3935; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = 1351692389 - ) - int field3919; + int field3934; + @ObfuscatedName("at") + boolean field3947; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 2094154461 + intValue = 1154854303 ) - int field3920; + int field3938; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1112820969 + ) + int field3937; @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 555115055 - ) - int field3921; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = -2000907591 - ) - int field3922; - @ObfuscatedName("at") - String field3934; - @ObfuscatedName("an") - String field3924; - @ObfuscatedName("ag") - String field3907; - @ObfuscatedName("ai") - String field3926; - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = -2099364457 - ) - int field3927; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 1890356539 + 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 + ) + int field3939; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -807185627 + ) + int field3944; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -1858381727 + ) + int field3945; + @ObfuscatedName("aj") + String field3946; + @ObfuscatedName("ay") + String field3927; + @ObfuscatedName("ad") + String field3948; + @ObfuscatedName("ac") + String field3949; @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1529496749 + intValue = -100344441 + ) + int field3950; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = -932660889 + ) + int field3957; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 472073959 ) int field3929; - @ObfuscatedName("bq") - @ObfuscatedGetter( - intValue = -735779413 - ) - int field3930; @ObfuscatedName("bf") - String field3931; - @ObfuscatedName("bc") - String field3932; - @ObfuscatedName("bk") - int[] field3933; - @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1285130001 + intValue = -1521683725 ) - int field3923; - @ObfuscatedName("bi") - String field3906; + int field3953; + @ObfuscatedName("bc") + String field3954; + @ObfuscatedName("bo") + String field3955; + @ObfuscatedName("bd") + int[] field3956; + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = 912496001 + ) + int field3943; + @ObfuscatedName("bu") + String field3952; 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.field3933 = new int[3]; - this.field3911 = var1; - this.field3904 = var2; - this.field3913 = var3; - this.field3914 = var4; - this.field3915 = var5; - this.field3916 = var6; - this.field3917 = var7; - this.field3935 = var8; - this.field3919 = var9; - this.field3920 = var10; - this.field3921 = var11; - this.field3922 = var12; - this.field3934 = var13; - this.field3924 = var14; - this.field3907 = var15; - this.field3926 = var16; - this.field3927 = var17; - this.field3928 = var18; + 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.field3930 = var20; - this.field3931 = var21; - this.field3932 = var22; - this.field3933 = var23; - this.field3923 = var24; - this.field3906 = var25; + this.field3953 = var20; + this.field3954 = var21; + this.field3955 = var22; + this.field3956 = var23; + this.field3943 = var24; + this.field3952 = var25; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-119977532" + signature = "(Lkb;I)V", + garbageValue = "1274635079" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); - var1.writeByte(this.field3911); - var1.writeByte(this.field3904 ? 1 : 0); - var1.writeShort(this.field3913); - var1.writeByte(this.field3914); - var1.writeByte(this.field3915); - var1.writeByte(this.field3916); - var1.writeByte(this.field3917); - var1.writeByte(this.field3935 ? 1 : 0); - var1.writeShort(this.field3919); - var1.writeByte(this.field3920); - var1.writeMedium(this.field3921); - var1.writeShort(this.field3922); - var1.writeStringCp1252NullCircumfixed(this.field3934); - var1.writeStringCp1252NullCircumfixed(this.field3924); - var1.writeStringCp1252NullCircumfixed(this.field3907); - var1.writeStringCp1252NullCircumfixed(this.field3926); + var1.writeByte(this.field3934); + var1.writeByte(this.field3947 ? 1 : 0); + var1.writeShort(this.field3938); + var1.writeByte(this.field3937); var1.writeByte(this.field3928); - var1.writeShort(this.field3927); - var1.writeStringCp1252NullCircumfixed(this.field3931); - var1.writeStringCp1252NullCircumfixed(this.field3932); + 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.field3930); + var1.writeByte(this.field3953); - for (int var2 = 0; var2 < this.field3933.length; ++var2) { - var1.writeInt(this.field3933[var2]); + for (int var2 = 0; var2 < this.field3956.length; ++var2) { + var1.writeInt(this.field3956[var2]); } - var1.writeInt(this.field3923); - var1.writeStringCp1252NullCircumfixed(this.field3906); + var1.writeInt(this.field3943); + var1.writeStringCp1252NullCircumfixed(this.field3952); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "0" + garbageValue = "-86" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + DirectByteArrayCopier.method4012(this.field3934); - var2 += DirectByteArrayCopier.method4012(this.field3924); - var2 += DirectByteArrayCopier.method4012(this.field3907); - var2 += DirectByteArrayCopier.method4012(this.field3926); - var2 += DirectByteArrayCopier.method4012(this.field3931); - var2 += DirectByteArrayCopier.method4012(this.field3932); - var2 += DirectByteArrayCopier.method4012(this.field3906); + 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); return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 5ea4609603..d005203217 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("lz") +@ObfuscatedName("mm") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Llv;", - garbageValue = "-1317089795" + signature = "(B)Lmq;", + garbageValue = "1" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 38cc66e09f..d849b06f64 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,157 +3,156 @@ 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("bi") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lku;" ) @Export("username") Username username; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhk;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -791182983 + intValue = -955452579 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2135485127 + intValue = -1682761079 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("actions") String[] actions; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1334071439 + intValue = -1517162387 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 31608153 + intValue = 614146335 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -595586759 + intValue = -550900363 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 492199091 + intValue = 1364374011 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1158770925 + intValue = -1470813775 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1060371069 + intValue = 168679087 ) - int field622; - @ObfuscatedName("v") + int field662; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1973913223 + intValue = 620810729 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -89254999 + intValue = -2027049547 ) - int field620; - @ObfuscatedName("x") + int field657; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lel;" ) @Export("model0") Model model0; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 94473955 + intValue = 1127396435 ) - int field626; - @ObfuscatedName("k") + int field659; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1646253599 + intValue = 240208849 ) - int field627; - @ObfuscatedName("q") + int field660; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 18993525 + intValue = -2013432115 ) - int field628; - @ObfuscatedName("z") + int field661; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1302670611 + intValue = -971151235 ) - int field629; - @ObfuscatedName("y") + int field664; + @ObfuscatedName("l") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1851536029 + intValue = -1431900799 ) @Export("team") int team; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("isHidden") boolean isHidden; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 418590373 + intValue = -777722891 ) @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -895014683 + intValue = -1532250791 ) @Export("index") int index; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("isInClanChat") TriBool isInClanChat; @ObfuscatedName("ae") - boolean field621; - @ObfuscatedName("af") + boolean field670; + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1551600703 + intValue = 1349885547 ) @Export("tileX") int tileX; - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 212383731 + intValue = -1671422285 ) @Export("tileY") int tileY; @@ -176,13 +175,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field621 = false; + this.field670 = false; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "20" + signature = "(Lkb;I)V", + garbageValue = "-2042142749" ) @Export("read") final void read(Buffer var1) { @@ -209,7 +208,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - int var8 = HealthBarDefinition.ItemDefinition_get(var4[var5] - 512).team; + int var8 = AbstractWorldMapData.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -221,7 +220,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= PlayerAppearance.field2545[var6].length) { + if (var7 < 0 || var7 >= VertexNormal.field1764[var6].length) { var7 = 0; } @@ -264,10 +263,10 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class192.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapIcon_0.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == class192.localPlayer) { + if (this == ByteArrayPool.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -285,10 +284,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1723343174" + garbageValue = "990067508" ) @Export("isFriend") boolean isFriend() { @@ -299,30 +298,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-55" + signature = "(I)V", + garbageValue = "77261851" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-379994373" + garbageValue = "-1863320246" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = KeyHandler.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = Projectile.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1808500524" + garbageValue = "1535464163" ) @Export("isClanMember") boolean isClanMember() { @@ -333,48 +332,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "752660623" + signature = "(B)V", + garbageValue = "81" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2107067145" + signature = "(B)V", + garbageValue = "101" ) @Export("updateIsInClanChat") void updateIsInClanChat() { this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2147227009" + signature = "(B)I", + garbageValue = "52" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? NetCache.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? class237.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.readySequence == super.movementSequence && var1 != null ? null : SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -384,9 +383,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field980, 0); + var4.offsetBy(0, -super.field1033, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -399,7 +398,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field622 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y); + var4.offsetBy(this.field662 - super.x, this.tileHeight2 - this.tileHeight, this.field657 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -424,7 +423,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field622 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096); + var4.offsetBy(super.x - this.field662, this.tileHeight - this.tileHeight2, super.y - this.field657); } } @@ -434,174 +433,24 @@ public final class Player extends Actor { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIBB)V", - garbageValue = "74" + signature = "(IIBI)V", + garbageValue = "-618087503" ) - final void method1266(int var1, int var2, byte var3) { - if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { + final void method1339(int var1, int var2, byte var3) { + if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } - super.field967 = -1; + super.field1015 = -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) { - Player var4 = this; - int var5 = super.pathX[0]; - int var6 = super.pathY[0]; - int var7 = this.transformedSize(); - if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { - int var9 = this.transformedSize(); - Client.field809.approxDestinationX = var1; - Client.field809.approxDestinationY = var2; - Client.field809.approxDestinationSizeX = 1; - Client.field809.approxDestinationSizeY = 1; - class65 var10 = Client.field809; - CollisionMap var12 = Client.collisionMaps[this.plane]; - int[] var13 = Client.field920; - int[] var14 = Client.field921; - int var15 = 0; - - label244: - while (true) { - int var16; - if (var15 >= 128) { - boolean var34; - if (var9 == 1) { - var34 = UserList.method5167(var5, var6, var10, var12); - } else if (var9 == 2) { - var34 = World.method1770(var5, var6, var10, var12); - } else { - var34 = WorldMapDecoration.method346(var5, var6, var9, var10, var12); - } - - int var8; - label265: { - var16 = var5 - 64; - int var17 = var6 - 64; - int var18 = ChatChannel.field1289; - int var19 = class173.field2093; - int var20; - int var21; - int var23; - if (!var34) { - var20 = Integer.MAX_VALUE; - var21 = Integer.MAX_VALUE; - byte var22 = 10; - var23 = var10.approxDestinationX; - int var24 = var10.approxDestinationY; - int var25 = var10.approxDestinationSizeX; - int var26 = var10.approxDestinationSizeY; - - for (int var27 = var23 - var22; var27 <= var23 + var22; ++var27) { - for (int var28 = var24 - var22; var28 <= var24 + var22; ++var28) { - int var29 = var27 - var16; - int var30 = var28 - var17; - if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class173.distances[var29][var30] < 100) { - int var31 = 0; - if (var27 < var23) { - var31 = var23 - var27; - } else if (var27 > var23 + var25 - 1) { - var31 = var27 - (var23 + var25 - 1); - } - - int var32 = 0; - if (var28 < var24) { - var32 = var24 - var28; - } else if (var28 > var24 + var26 - 1) { - var32 = var28 - (var26 + var24 - 1); - } - - int var33 = var31 * var31 + var32 * var32; - if (var33 < var20 || var33 == var20 && class173.distances[var29][var30] < var21) { - var20 = var33; - var21 = class173.distances[var29][var30]; - var18 = var27; - var19 = var28; - } - } - } - } - - if (var20 == Integer.MAX_VALUE) { - var8 = -1; - break label265; - } - } - - if (var18 == var5 && var19 == var6) { - var8 = 0; - } else { - byte var36 = 0; - class173.bufferX[var36] = var18; - var20 = var36 + 1; - class173.bufferY[var36] = var19; - - int var37; - for (var21 = var37 = class173.directions[var18 - var16][var19 - var17]; var18 != var5 || var6 != var19; var21 = class173.directions[var18 - var16][var19 - var17]) { - if (var21 != var37) { - var37 = var21; - class173.bufferX[var20] = var18; - class173.bufferY[var20++] = var19; - } - - if ((var21 & 2) != 0) { - ++var18; - } else if ((var21 & 8) != 0) { - --var18; - } - - if ((var21 & 1) != 0) { - ++var19; - } else if ((var21 & 4) != 0) { - --var19; - } - } - - var23 = 0; - - while (var20-- > 0) { - var13[var23] = class173.bufferX[var20]; - var14[var23++] = class173.bufferY[var20]; - if (var23 >= var13.length) { - break; - } - } - - var8 = var23; - } - } - - var15 = var8; - if (var8 < 1) { - break; - } - - var16 = 0; - - while (true) { - if (var16 >= var15 - 1) { - break label244; - } - - var4.method1268(Client.field920[var16], Client.field921[var16], (byte)2); - ++var16; - } - } - - for (var16 = 0; var16 < 128; ++var16) { - class173.directions[var15][var16] = 0; - class173.distances[var15][var16] = 99999999; - } - - ++var15; - } - } + SoundCache.method2609(this, var1, var2, (byte)2); } - this.method1268(var1, var2, var3); + this.method1341(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -611,29 +460,29 @@ public final class Player extends Actor { } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1389622886" + garbageValue = "-2118599552" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field998 = 0; - super.field997 = 0; + super.field1032 = 0; + super.field1031 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); super.x = super.pathX[0] * 128 + var3 * 64; - super.y = var3 * 64 + super.pathY[0] * 128; + super.y = super.pathY[0] * 128 + var3 * 64; } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "1525296434" + garbageValue = "1447911882" ) - final void method1268(int var1, int var2, byte var3) { + final void method1341(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -649,124 +498,98 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-515224238" + garbageValue = "116176402" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "348475587" + signature = "(I)I", + garbageValue = "556074954" ) - static int method1300(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - } else { - var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + static int method1342() { + return ++Messages.Messages_count - 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); } - String var4 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]) { + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-389992863" + ) + static void method1383() { + Players.Players_count = 0; + + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1269[var0] = null; + Players.field1273[var0] = 1; + } + + } + + @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.", ""); + } + + } + + @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]; } - } - 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[--Message.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); } } - - var7 = Interpreter.Interpreter_intStack[--class320.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.field2674 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index d252124d3e..98d3252df6 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -3,64 +3,66 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hp") +@ObfuscatedName("hk") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("rb") - @ObfuscatedGetter( - intValue = 68473183 - ) - static int field2549; - @ObfuscatedName("l") - public static short[][] field2545; - @ObfuscatedName("j") - public static short[] field2547; - @ObfuscatedName("p") + @ObfuscatedName("t") + public static short[] field2539; + @ObfuscatedName("e") + public static short[][] field2535; + @ObfuscatedName("s") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("PlayerAppearance_cachedModels") - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("c") + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("dt") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("x") @Export("equipment") int[] equipment; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 925869529 + intValue = -1293293343 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -8371390842284104293L + longValue = 3080768602890783779L ) @Export("hash") long hash; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 5198838895924808709L + longValue = 1388997665214268647L ) - long field2544; + long field2538; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([I[IZII)V", - garbageValue = "-1314477676" + garbageValue = "522059742" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -68,8 +70,8 @@ public class PlayerAppearance { var1 = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < CollisionMap.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = WorldMapSection2.KitDefinition_get(var6); + 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) { var1[equipmentIndices[var5]] = var6 + 256; break; @@ -85,10 +87,10 @@ public class PlayerAppearance { this.setHash(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "1565149766" + garbageValue = "1928193476" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -102,17 +104,17 @@ public class PlayerAppearance { if (!var2) { --var3; if (var3 < 0) { - var3 = CollisionMap.KitDefinition_fileCount - 1; + var3 = KitDefinition.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= CollisionMap.KitDefinition_fileCount) { + if (var3 >= KitDefinition.KitDefinition_fileCount) { var3 = 0; } } - var4 = WorldMapSection2.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); + var4 = WorldMapElement.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); @@ -120,37 +122,50 @@ public class PlayerAppearance { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "1120894554" + garbageValue = "-1053799565" ) - public void method4066(int var1, boolean var2) { + public void method4089(int var1, boolean var2) { int var3 = this.bodyColors[var1]; + boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = field2545[var1].length - 1; + var3 = VertexNormal.field1764[var1].length - 1; } - } while(!FileSystem.method3572(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } else { do { ++var3; - if (var3 >= field2545[var1].length) { + if (var3 >= VertexNormal.field1764[var1].length) { var3 = 0; } - } while(!FileSystem.method3572(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "-1200198186" + garbageValue = "-1082412676" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -159,10 +174,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "2032757019" + signature = "(Lkb;I)V", + garbageValue = "-1419902667" ) @Export("write") public void write(Buffer var1) { @@ -184,10 +199,10 @@ public class PlayerAppearance { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-104" + garbageValue = "110" ) @Export("setHash") void setHash() { @@ -229,15 +244,15 @@ public class PlayerAppearance { } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lip;ILip;IB)Ldx;", - garbageValue = "66" + signature = "(Ljc;ILjc;II)Lel;", + garbageValue = "-1571730911" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return NetCache.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return class237.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -266,18 +281,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !WorldMapSection2.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !WorldMapElement.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !HealthBarDefinition.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (this.field2544 != -1L) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2544); + if (this.field2538 != -1L) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2538); } if (var8 == null) { @@ -294,75 +309,75 @@ public class PlayerAppearance { var13 = var7[var12]; ModelData var14; if (var13 >= 256 && var13 < 512) { - var14 = WorldMapSection2.KitDefinition_get(var13 - 256).getModelData(); + var14 = WorldMapElement.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var16[var11++] = var14; } } if (var13 >= 512) { - var14 = HealthBarDefinition.ItemDefinition_get(var13 - 512).method4732(this.isFemale); + var14 = AbstractWorldMapData.ItemDefinition_get(var13 - 512).method4722(this.isFemale); if (var14 != null) { var16[var11++] = var14; } } } - ModelData var18 = new ModelData(var16, var11); + ModelData var17 = new ModelData(var16, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < field2545[var13].length) { - var18.recolor(WorldMapLabelSize.field128[var13], field2545[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < VertexNormal.field1764[var13].length) { + var17.recolor(WorldMapLabel.field278[var13], VertexNormal.field1764[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < class208.field2514[var13].length) { - var18.recolor(field2547[var13], class208.field2514[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2535[var13].length) { + var17.recolor(field2539[var13], field2535[var13][this.bodyColors[var13]]); } } - var8 = var18.toModel(64, 850, -30, -50, -30); + var8 = var17.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var8, var5); - this.field2544 = var5; + this.field2538 = var5; } } if (var1 == null && var3 == null) { return var8; } else { - Model var17; + Model var18; if (var1 != null && var3 != null) { - var17 = var1.applyTransformations(var8, var2, var3, var4); + var18 = var1.applyTransformations(var8, var2, var3, var4); } else if (var1 != null) { - var17 = var1.transformActorModel(var8, var2); + var18 = var1.transformActorModel(var8, var2); } else { - var17 = var3.transformActorModel(var8, var4); + var18 = var3.transformActorModel(var8, var4); } - return var17; + return var18; } } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Ldg;", - garbageValue = "1124292416" + signature = "(S)Lea;", + garbageValue = "180" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return NetCache.getNpcDefinition(this.npcTransformId).getModelData(); + return class237.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 && !WorldMapSection2.KitDefinition_get(var3 - 256).method4533()) { + if (var3 >= 256 && var3 < 512 && !WorldMapElement.KitDefinition_get(var3 - 256).method4523()) { var1 = true; } - if (var3 >= 512 && !HealthBarDefinition.ItemDefinition_get(var3 - 512).method4731(this.isFemale)) { + if (var3 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var3 - 512).method4772(this.isFemale)) { var1 = true; } } @@ -378,14 +393,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = WorldMapSection2.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = WorldMapElement.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = HealthBarDefinition.ItemDefinition_get(var5 - 512).method4741(this.isFemale); + var6 = AbstractWorldMapData.ItemDefinition_get(var5 - 512).method4724(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -395,12 +410,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < field2545[var5].length) { - var8.recolor(WorldMapLabelSize.field128[var5], field2545[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < VertexNormal.field1764[var5].length) { + var8.recolor(WorldMapLabel.field278[var5], VertexNormal.field1764[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < class208.field2514[var5].length) { - var8.recolor(field2547[var5], class208.field2514[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2535[var5].length) { + var8.recolor(field2539[var5], field2535[var5][this.bodyColors[var5]]); } } @@ -409,49 +424,439 @@ public class PlayerAppearance { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "34382709" + garbageValue = "1778112126" ) @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 + NetCache.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 + class237.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-905088016" + signature = "(Lbb;II)V", + garbageValue = "2013269807" ) - @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); + @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 (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + 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; - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; + 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 = class201.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") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-167013262" + ) + @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; } - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; + if (var0 == 57) { + HealthBarUpdate.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + MouseRecorder.updateGameState(11); + return; } - var4.ids = var5; - var4.quantities = var6; + if (var0 == 61) { + Login.loginIndex = 7; + } else { + HealthBarUpdate.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + 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/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index f7b299af0c..2e3e4e13b8 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,63 +3,64 @@ 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("hu") +@ObfuscatedName("iz") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lhu;" + signature = "Liz;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 82247459 + intValue = 188785687 ) @Export("id") final int id; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 583511619 + intValue = -25874505 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("isUser") public final boolean isUser; @@ -70,22 +71,45 @@ public enum PlayerType implements Enumerated { this.isUser = var7; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BI)Laf;", - garbageValue = "1601863224" + signature = "(ILce;ZI)I", + garbageValue = "-512423566" ) - static WorldMapSprite method4204(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(class14.convertJpgToSprite(var0).pixels); + static int method4233(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; + } + + 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); + return 1; + } + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 3c40c103d5..3685b15044 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -3,66 +3,70 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cz") +@ObfuscatedName("cj") @Implements("Players") public class Players { - @ObfuscatedName("o") - static byte[] field1236; - @ObfuscatedName("e") - static byte[] field1237; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "[Lkp;" - ) - static Buffer[] field1235; - @ObfuscatedName("g") + @ObfuscatedName("rh") @ObfuscatedGetter( - intValue = 896237733 + intValue = 1328419047 + ) + static int field1280; + @ObfuscatedName("k") + static byte[] field1267; + @ObfuscatedName("d") + static byte[] field1273; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "[Lkb;" + ) + static Buffer[] field1269; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 2104068463 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1595990081 + intValue = -1941416783 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -564068269 + intValue = 1119363991 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lkb;" ) - static Buffer field1248; + static Buffer field1268; static { - field1236 = new byte[2048]; - field1237 = new byte[2048]; - field1235 = new Buffer[2048]; + field1267 = new byte[2048]; + field1273 = new byte[2048]; + field1269 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -72,138 +76,15 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1248 = new Buffer(new byte[5000]); + field1268 = new Buffer(new byte[5000]); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(Liy;I)V", + garbageValue = "731875079" ) - static void method2179() { - Tiles.field502 = null; - Tiles.field514 = null; - Tiles.field507 = null; - Tiles.field518 = null; - UrlRequest.field1940 = null; - InterfaceParent.field565 = null; - Tiles.field509 = null; - class268.Tiles_hue = null; - HorizontalAlignment.Tiles_saturation = null; - class30.Tiles_lightness = null; - class40.Tiles_hueMultiplier = null; - TileItemPile.field1529 = null; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "41" - ) - static int method2203(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - } else { - var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - } - - NPCDefinition.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[--class320.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = class192.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - class320.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemDefinition var6 = HealthBarDefinition.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field2627 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2627; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-603173589" - ) - static int method2200(int var0, Script var1, boolean var2) { - Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class83.method2108(WorldMapIcon_0.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1574244944" - ) - static boolean method2201() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1351198777" - ) - static final void method2189() { - Client.field823 = Client.cycleCntr; - FileSystem.ClanChat_inClanChat = true; + public static void method2251(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 1333a55ff2..f11d72bdca 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,64 +1,59 @@ +import 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("kx") +@ObfuscatedName("lg") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Llg;" ) - static final PrivateChatMode field3788; - @ObfuscatedName("t") + static final PrivateChatMode field3801; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Llg;" ) - public static final PrivateChatMode field3790; - @ObfuscatedName("o") + public static final PrivateChatMode field3806; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Llg;" ) - static final PrivateChatMode field3789; - @ObfuscatedName("e") + static final PrivateChatMode field3803; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1866307707 + intValue = 1679462339 ) - public final int field3787; + public final int field3804; static { - field3788 = new PrivateChatMode(0); - field3790 = new PrivateChatMode(1); - field3789 = new PrivateChatMode(2); + field3801 = new PrivateChatMode(0); + field3806 = new PrivateChatMode(1); + field3803 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3787 = var1; + this.field3804 = var1; } - @ObfuscatedName("ld") + @ObfuscatedName("kx") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-78" + signature = "(Lhe;B)Ljava/lang/String;", + garbageValue = "70" ) - static void method5952() { - if (Client.field728 && class192.localPlayer != null) { - int var0 = class192.localPlayer.pathX[0]; - int var1 = class192.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - PendingSpawn.oculusOrbFocalPointX = class192.localPlayer.x; - int var2 = WorldMapSectionType.getTileHeight(class192.localPlayer.x, class192.localPlayer.y, Clock.Client_plane) - Client.camFollowHeight; - if (var2 < WorldMapSectionType.field166) { - WorldMapSectionType.field166 = var2; - } - - Skeleton.oculusOrbFocalPointY = class192.localPlayer.y; - Client.field728 = false; + 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; } - } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 548ada0e50..21d1d24ef0 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,129 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("ct") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("c") + @ObfuscatedName("sj") + @ObfuscatedSignature( + signature = "Lco;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 915213611 + intValue = -101649187 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 378032649 + intValue = -1827872967 ) @Export("plane") int plane; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1585922035 + intValue = -1361221531 ) @Export("sourceX") int sourceX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1462535825 + intValue = 1265488669 ) @Export("sourceY") int sourceY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1681715111 + intValue = -1417484877 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 903870771 + intValue = 1177641065 ) @Export("endHeight") int endHeight; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1250439791 + intValue = 1536269421 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1640896565 + intValue = -1563239709 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2117578399 + intValue = -1004662519 ) @Export("slope") int slope; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -544986491 + intValue = 491202369 ) @Export("startHeight") int startHeight; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1226806671 + intValue = 219402729 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("isMoving") boolean isMoving; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("x") double x; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("y") double y; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("z") double z; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("speedX") double speedX; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("speedY") double speedY; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("speed") double speed; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("speedZ") double speedZ; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -347740869 + intValue = -858077797 ) @Export("yaw") int yaw; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1566997977 + intValue = -1652545155 ) @Export("pitch") int pitch; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lip;" + signature = "Ljc;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1565551535 + intValue = -299919777 ) @Export("frame") int frame; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -449479451 + intValue = -1622544383 ) @Export("frameCycle") int frameCycle; @@ -147,19 +153,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = class65.SpotAnimationDefinition_get(this.id).sequence; + int var12 = MouseHandler.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var12); + this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-8439776" + garbageValue = "-251648925" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -168,7 +174,7 @@ 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.startHeight * var5 / var9 + (double)this.sourceX; + this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; this.z = (double)this.sourceZ; } @@ -181,20 +187,20 @@ public final class Projectile extends Entity { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); + this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1466465553" + garbageValue = "-1296799789" ) @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 + (double)var1 * (double)var1 * this.accelerationZ * 0.5D; + this.z += (double)var1 * this.speedZ + 0.5D * this.accelerationZ * (double)var1 * (double)var1; this.speedZ += (double)var1 * this.accelerationZ; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; @@ -220,14 +226,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class65.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = MouseHandler.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -237,112 +243,32 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "1588389252" + signature = "(II)I", + garbageValue = "29577048" ) - public static final boolean method2160(char var0) { - if (Character.isISOControl(var0)) { - return false; - } else if (ArchiveDiskAction.isAlphaNumeric(var0)) { - return true; + @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 { - char[] var1 = class339.field4042; - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } + byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitDefinition(); + if (var7 != null) { + var2.decode(new Buffer(var7)); } - var1 = class339.field4041; - - for (var2 = 0; var2 < var1.length; ++var2) { - var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - - return false; + VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; } - } - @ObfuscatedName("ex") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2129018303" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - Username.client.method952(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field679 = 0; - Client.field680 = 0; - Client.timer.method5062(var0); - if (var0 != 20) { - UserComparator3.method3497(false); - } - } - - if (var0 != 20 && var0 != 40 && ClientPreferences.field1052 != null) { - ClientPreferences.field1052.close(); - ClientPreferences.field1052 = null; - } - - if (Client.gameState == 25) { - Client.field695 = 0; - Client.field791 = 0; - Client.field884 = 1; - Client.field700 = 0; - Client.field733 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, false, 4); - } else if (Login.field1163) { - ScriptFrame.titleboxSprite = null; - Login.titlebuttonSprite = null; - class16.runesSprite = null; - Login.leftTitleSprite = null; - class32.rightTitleSprite = null; - FloorDecoration.logoSprite = null; - Login.title_muteSprite = null; - WorldMapSprite.options_buttons_0Sprite = null; - DirectByteArrayCopier.options_buttons_2Sprite = null; - UserComparator6.worldSelectBackSprites = null; - ReflectionCheck.worldSelectFlagSprites = null; - ItemContainer.worldSelectArrows = null; - DynamicObject.worldSelectStars = null; - WorldMapDecorationType.field2739 = null; - WorldMapLabelSize.loginScreenRunesAnimation.method1834(); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; - class197.musicTrackGroupId = -1; - class83.musicTrackFileId = -1; - AttackOption.musicTrackVolume = 0; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 2; - TextureProvider.method2833(true); - Login.field1163 = false; - } - } else { - ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, true, 0); - } - - Client.gameState = var0; - } + 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/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 752f63e08b..6c044a70ec 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("bq") +@ObfuscatedName("bh") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("component") Component component; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "864264783" + garbageValue = "894605018" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-529782293" + garbageValue = "1321130014" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "934582222" + signature = "(IIIIS)V", + garbageValue = "32475" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "1734419092" + garbageValue = "-972433777" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-288564327" + garbageValue = "297654999" ) @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 e66e616213..3cd3f06063 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("lb") +@ObfuscatedName("li") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("dl") + @ObfuscatedName("db") @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("dv") + @ObfuscatedName("dw") @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("do") + @ObfuscatedName("de") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("di") + @ObfuscatedName("dh") @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("dc") + @ObfuscatedName("dk") @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("dj") + @ObfuscatedName("da") @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("de") + @ObfuscatedName("do") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("df") + @ObfuscatedName("dr") @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("dn") + @ObfuscatedName("dx") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dq") + @ObfuscatedName("dc") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dd") + @ObfuscatedName("ds") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dr") + @ObfuscatedName("dt") @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("dk") + @ObfuscatedName("dp") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dg") + @ObfuscatedName("df") @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("dt") + @ObfuscatedName("di") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("du") + @ObfuscatedName("dn") @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("db") + @ObfuscatedName("ea") @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("dh") + @ObfuscatedName("ex") @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("dz") + @ObfuscatedName("eo") @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("dx") + @ObfuscatedName("et") @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("da") + @ObfuscatedName("eh") @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("dp") + @ObfuscatedName("eq") @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 78c5dd3843..c1ed656b6d 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,65 +3,65 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("ec") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("c") - static boolean field1761; - @ObfuscatedName("t") - static boolean field1755; - @ObfuscatedName("o") + @ObfuscatedName("x") + static boolean field1778; + @ObfuscatedName("m") + static boolean field1782; + @ObfuscatedName("k") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("e") - public static boolean field1762; - @ObfuscatedName("i") + @ObfuscatedName("d") + public static boolean field1772; + @ObfuscatedName("w") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leu;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("s") - static int[] field1777; - @ObfuscatedName("a") - static int[] field1778; - @ObfuscatedName("u") + @ObfuscatedName("j") + static int[] field1792; + @ObfuscatedName("y") + static int[] field1793; + @ObfuscatedName("f") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; @ObfuscatedName("ae") @@ -69,26 +69,26 @@ public class Rasterizer3D extends Rasterizer2D { public static int[] Rasterizer3D_cosine; static { - field1761 = false; - field1755 = false; + field1778 = false; + field1782 = false; Rasterizer3D_isLowDetailTexture = false; - field1762 = true; + field1772 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1777 = new int[512]; - field1778 = new int[2048]; + field1792 = new int[512]; + field1793 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1777[var0] = 32768 / var0; + field1792[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1778[var0] = 65536 / var0; + field1793[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[DynamicObject.method2293(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[Calendar.method4033(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; @@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("e") - public static final void method3101(int var0, int var1) { + @ObfuscatedName("d") + public static final void method3099(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lep;)V" + signature = "(Leu;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("j") - public static void method3066(int var0, int var1, int var2) { - field1761 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @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("m") - static final void method3116(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("e") + static final void method3105(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; int var10 = var1 - var0; int var11 = var5 - var3; @@ -767,10 +767,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (field1761) { + if (field1778) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -786,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1762) { + if (field1772) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -870,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("h") - public static final void method3123(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("p") + public static final void method3107(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); @@ -911,33 +911,7 @@ public class Rasterizer3D extends Rasterizer2D { var1 = 0; } - if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -963,6 +937,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } else { var4 = var3 <<= 14; @@ -978,33 +978,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, var5 >> 14, var3 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 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 +1004,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, var5 >> 14, var3 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } } @@ -1057,33 +1057,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -1109,6 +1083,32 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } } } else { var5 = var4 <<= 14; @@ -1326,10 +1326,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1761) { + if (field1778) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1421,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("n") - static final void method3078(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("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) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3116(var0, var1, var2, var3, var4, var5, method3082(var20, var6), method3082(var20, var7), method3082(var20, var8)); + method3105(var0, var1, var2, var3, var4, var5, method3112(var20, var6), method3112(var20, var7), method3112(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1755 = Rasterizer3D_textureLoader.vmethod3347(var18); + field1782 = Rasterizer3D_textureLoader.vmethod3388(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -1590,41 +1590,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1658,6 +1624,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } } @@ -2042,10 +2042,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("x") + @ObfuscatedName("h") @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 (field1761) { + if (field1778) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2109,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1755) { + if (field1782) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2304,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1755) { + if (field1782) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2463,17 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("g") @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); - method3116(var0, var1, var2, var3, var4, var5, method3082(var20, var6), method3082(var20, var7), method3082(var20, var8)); + method3105(var0, var1, var2, var3, var4, var5, method3112(var20, var6), method3112(var20, var7), method3112(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1755 = Rasterizer3D_textureLoader.vmethod3347(var18); + field1782 = Rasterizer3D_textureLoader.vmethod3388(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2545,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -2613,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -2734,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -2802,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var5 = var4 <<= 14; @@ -3085,10 +3085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("q") + @ObfuscatedName("i") @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 (field1761) { + if (field1778) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3141,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1755) { + if (field1782) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3284,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1755) { + if (field1782) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3401,8 +3401,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("z") - static final int method3082(int var0, int var1) { + @ObfuscatedName("a") + static final int method3112(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3413,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("y") - static final int method3083(int var0, int var1, int var2, int var3) { + @ObfuscatedName("o") + static final int method3113(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 method3084(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("a") - static final int method3112(int var0, int var1, int var2, int var3) { + static final int method3115(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("u") - static final int method3086(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ae") + static final int method3116(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("ae") - static final int method3087(int var0, int var1, int var2, int var3) { + @ObfuscatedName("an") + static final int method3151(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("af") - static final int method3088(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ai") + static final int method3118(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 7cb88a066e..76d472776d 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("de") +@ObfuscatedName("dy") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("c") - int field1462; - @ObfuscatedName("t") - int field1463; - @ObfuscatedName("o") - int field1452; - @ObfuscatedName("e") - int field1464; - @ObfuscatedName("i") - int field1454; - @ObfuscatedName("g") - int field1455; + @ObfuscatedName("x") + int field1490; + @ObfuscatedName("m") + int field1481; + @ObfuscatedName("k") + int field1482; @ObfuscatedName("d") - int field1456; - @ObfuscatedName("l") + int field1483; + @ObfuscatedName("v") + int field1484; + @ObfuscatedName("q") + int field1489; + @ObfuscatedName("z") + int field1486; + @ObfuscatedName("t") @Export("numLoops") int numLoops; - @ObfuscatedName("j") + @ObfuscatedName("e") @Export("start") int start; - @ObfuscatedName("m") + @ObfuscatedName("s") @Export("end") int end; @ObfuscatedName("p") - boolean field1450; - @ObfuscatedName("h") - int field1461; - @ObfuscatedName("v") - int field1460; + boolean field1493; @ObfuscatedName("n") - int field1453; - @ObfuscatedName("x") - int field1451; + int field1491; + @ObfuscatedName("u") + int field1485; + @ObfuscatedName("h") + int field1492; + @ObfuscatedName("g") + int field1494; @ObfuscatedSignature( - signature = "(Lcv;III)V" + signature = "(Ldm;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1450 = var1.field1379; - this.field1463 = var2; - this.field1452 = var3; - this.field1464 = var4; - this.field1462 = 0; - this.method2607(); + this.field1493 = var1.field1407; + this.field1481 = var2; + this.field1482 = var3; + this.field1483 = var4; + this.field1490 = 0; + this.method2658(); } @ObfuscatedSignature( - signature = "(Lcv;II)V" + signature = "(Ldm;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1450 = var1.field1379; - this.field1463 = var2; - this.field1452 = var3; - this.field1464 = 8192; - this.field1462 = 0; - this.method2607(); + this.field1493 = var1.field1407; + this.field1481 = var2; + this.field1482 = var3; + this.field1483 = 8192; + this.field1490 = 0; + this.method2658(); } - @ObfuscatedName("i") - void method2607() { - this.field1454 = this.field1452; - this.field1455 = method2728(this.field1452, this.field1464); - this.field1456 = method2603(this.field1452, this.field1464); + @ObfuscatedName("w") + void method2658() { + this.field1484 = this.field1482; + this.field1489 = method2721(this.field1482, this.field1483); + this.field1486 = method2652(this.field1482, this.field1483); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Ldn;" + signature = "()Lds;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("l") - protected int vmethod3965() { - return this.field1452 == 0 && this.field1461 == 0 ? 0 : 1; + @ObfuscatedName("z") + protected int vmethod3984() { + return this.field1482 == 0 && this.field1491 == 0 ? 0 : 1; } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1452 == 0 && this.field1461 == 0) { + if (this.field1482 == 0 && this.field1491 == 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.field1462 < 0) { - if (this.field1463 <= 0) { - this.method2616(); + if (this.field1490 < 0) { + if (this.field1481 <= 0) { + this.method2794(); this.remove(); return; } - this.field1462 = 0; + this.field1490 = 0; } - if (this.field1462 >= var7) { - if (this.field1463 >= 0) { - this.method2616(); + if (this.field1490 >= var7) { + if (this.field1481 >= 0) { + this.method2794(); this.remove(); return; } - this.field1462 = var7 - 1; + this.field1490 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1450) { - if (this.field1463 < 0) { - var9 = this.method2630(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1462 >= var5) { + if (this.field1493) { + if (this.field1481 < 0) { + var9 = this.method2679(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1490 >= var5) { return; } - this.field1462 = var5 + var5 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var5 + var5 - 1 - this.field1490; + this.field1481 = -this.field1481; } while (true) { - var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1462 < var6) { + var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1490 < var6) { return; } - this.field1462 = var6 + var6 - 1 - this.field1462; - this.field1463 = -this.field1463; - var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1462 >= var5) { + 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) { return; } - this.field1462 = var5 + var5 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var5 + var5 - 1 - this.field1490; + this.field1481 = -this.field1481; } - } else if (this.field1463 < 0) { + } else if (this.field1481 < 0) { while (true) { - var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1462 >= var5) { + var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1490 >= var5) { return; } - this.field1462 = var6 - 1 - (var6 - 1 - this.field1462) % var8; + this.field1490 = var6 - 1 - (var6 - 1 - this.field1490) % var8; } } else { while (true) { - var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1462 < var6) { + var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1490 < var6) { return; } - this.field1462 = var5 + (this.field1462 - var5) % var8; + this.field1490 = var5 + (this.field1490 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field1450) { - label146: { - if (this.field1463 < 0) { - var9 = this.method2630(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1462 >= var5) { + if (this.field1493) { + label139: { + if (this.field1481 < 0) { + var9 = this.method2679(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1490 >= var5) { return; } - this.field1462 = var5 + var5 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var5 + var5 - 1 - this.field1490; + this.field1481 = -this.field1481; if (--this.numLoops == 0) { - break label146; + break label139; } } do { - var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1462 < var6) { + var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1490 < var6) { return; } - this.field1462 = var6 + var6 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var6 + var6 - 1 - this.field1490; + this.field1481 = -this.field1481; if (--this.numLoops == 0) { break; } - var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1462 >= var5) { + var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1490 >= var5) { return; } - this.field1462 = var5 + var5 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var5 + var5 - 1 - this.field1490; + this.field1481 = -this.field1481; } while(--this.numLoops != 0); } } else { int var10; - if (this.field1463 < 0) { + if (this.field1481 < 0) { while (true) { - var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1462 >= var5) { + var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1490 >= var5) { return; } - var10 = (var6 - 1 - this.field1462) / var8; + var10 = (var6 - 1 - this.field1490) / var8; if (var10 >= this.numLoops) { - this.field1462 += var8 * this.numLoops; + this.field1490 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field1462 += var8 * var10; + this.field1490 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1462 < var6) { + var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1490 < var6) { return; } - var10 = (this.field1462 - var5) / var8; + var10 = (this.field1490 - var5) / var8; if (var10 >= this.numLoops) { - this.field1462 -= var8 * this.numLoops; + this.field1490 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field1462 -= var8 * var10; + this.field1490 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field1463 < 0) { - this.method2630(var1, var9, 0, var3, 0); - if (this.field1462 < 0) { - this.field1462 = -1; - this.method2616(); + if (this.field1481 < 0) { + this.method2679(var1, var9, 0, var3, 0); + if (this.field1490 < 0) { + this.field1490 = -1; + this.method2794(); this.remove(); } } else { - this.method2608(var1, var9, var7, var3, 0); - if (this.field1462 >= var7) { - this.field1462 = var7; - this.method2616(); + this.method2678(var1, var9, var7, var3, 0); + if (this.field1490 >= var7) { + this.field1490 = var7; + this.method2794(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("skip") public synchronized void skip(int var1) { - if (this.field1461 > 0) { - if (var1 >= this.field1461) { - if (this.field1452 == Integer.MIN_VALUE) { - this.field1452 = 0; - this.field1456 = 0; - this.field1455 = 0; - this.field1454 = 0; + 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; this.remove(); - var1 = this.field1461; + var1 = this.field1491; } - this.field1461 = 0; - this.method2607(); + this.field1491 = 0; + this.method2658(); } else { - this.field1454 += this.field1460 * var1; - this.field1455 += this.field1453 * var1; - this.field1456 += this.field1451 * var1; - this.field1461 -= var1; + this.field1484 += this.field1485 * var1; + this.field1489 += this.field1492 * var1; + this.field1486 += this.field1494 * var1; + this.field1491 -= var1; } } @@ -321,183 +321,179 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1462 < 0) { - if (this.field1463 <= 0) { - this.method2616(); + if (this.field1490 < 0) { + if (this.field1481 <= 0) { + this.method2794(); this.remove(); return; } - this.field1462 = 0; + this.field1490 = 0; } - if (this.field1462 >= var5) { - if (this.field1463 >= 0) { - this.method2616(); + if (this.field1490 >= var5) { + if (this.field1481 >= 0) { + this.method2794(); this.remove(); return; } - this.field1462 = var5 - 1; + this.field1490 = var5 - 1; } - this.field1462 += this.field1463 * var1; + this.field1490 += this.field1481 * var1; if (this.numLoops < 0) { - if (!this.field1450) { - if (this.field1463 < 0) { - if (this.field1462 >= var3) { + if (!this.field1493) { + if (this.field1481 < 0) { + if (this.field1490 >= var3) { return; } - this.field1462 = var4 - 1 - (var4 - 1 - this.field1462) % var6; + this.field1490 = var4 - 1 - (var4 - 1 - this.field1490) % var6; } else { - if (this.field1462 < var4) { + if (this.field1490 < var4) { return; } - this.field1462 = var3 + (this.field1462 - var3) % var6; + this.field1490 = var3 + (this.field1490 - var3) % var6; } } else { - if (this.field1463 < 0) { - if (this.field1462 >= var3) { + if (this.field1481 < 0) { + if (this.field1490 >= var3) { return; } - this.field1462 = var3 + var3 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var3 + var3 - 1 - this.field1490; + this.field1481 = -this.field1481; } - while (this.field1462 >= var4) { - this.field1462 = var4 + var4 - 1 - this.field1462; - this.field1463 = -this.field1463; - if (this.field1462 >= var3) { + while (this.field1490 >= var4) { + this.field1490 = var4 + var4 - 1 - this.field1490; + this.field1481 = -this.field1481; + if (this.field1490 >= var3) { return; } - this.field1462 = var3 + var3 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var3 + var3 - 1 - this.field1490; + this.field1481 = -this.field1481; } } } else { if (this.numLoops > 0) { - if (this.field1450) { - label125: { - if (this.field1463 < 0) { - if (this.field1462 >= var3) { + if (this.field1493) { + label123: { + if (this.field1481 < 0) { + if (this.field1490 >= var3) { return; } - this.field1462 = var3 + var3 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var3 + var3 - 1 - this.field1490; + this.field1481 = -this.field1481; if (--this.numLoops == 0) { - break label125; + break label123; } } do { - if (this.field1462 < var4) { + if (this.field1490 < var4) { return; } - this.field1462 = var4 + var4 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var4 + var4 - 1 - this.field1490; + this.field1481 = -this.field1481; if (--this.numLoops == 0) { break; } - if (this.field1462 >= var3) { + if (this.field1490 >= var3) { return; } - this.field1462 = var3 + var3 - 1 - this.field1462; - this.field1463 = -this.field1463; + this.field1490 = var3 + var3 - 1 - this.field1490; + this.field1481 = -this.field1481; } while(--this.numLoops != 0); } } else { - label157: { - int var7; - if (this.field1463 < 0) { - if (this.field1462 >= var3) { - return; - } - - var7 = (var4 - 1 - this.field1462) / var6; - if (var7 >= this.numLoops) { - this.field1462 += var6 * this.numLoops; - this.numLoops = 0; - break label157; - } - - this.field1462 += var6 * var7; - this.numLoops -= var7; - } else { - if (this.field1462 < var4) { - return; - } - - var7 = (this.field1462 - var3) / var6; - if (var7 >= this.numLoops) { - this.field1462 -= var6 * this.numLoops; - this.numLoops = 0; - break label157; - } - - this.field1462 -= var6 * var7; - this.numLoops -= var7; + int var7; + if (this.field1481 < 0) { + if (this.field1490 >= var3) { + return; } - return; + var7 = (var4 - 1 - this.field1490) / var6; + if (var7 < this.numLoops) { + this.field1490 += var6 * var7; + this.numLoops -= var7; + return; + } + + this.field1490 += var6 * this.numLoops; + this.numLoops = 0; + } else { + if (this.field1490 < var4) { + return; + } + + var7 = (this.field1490 - var3) / var6; + if (var7 < this.numLoops) { + this.field1490 -= var6 * var7; + this.numLoops -= var7; + return; + } + + this.field1490 -= var6 * this.numLoops; + this.numLoops = 0; } } } - if (this.field1463 < 0) { - if (this.field1462 < 0) { - this.field1462 = -1; - this.method2616(); + if (this.field1481 < 0) { + if (this.field1490 < 0) { + this.field1490 = -1; + this.method2794(); this.remove(); } - } else if (this.field1462 >= var5) { - this.field1462 = var5; - this.method2616(); + } else if (this.field1490 >= var5) { + this.field1490 = var5; + this.method2794(); this.remove(); } } } - @ObfuscatedName("h") - public synchronized void method2665(int var1) { - this.method2629(var1 << 6, this.method2613()); - } - - @ObfuscatedName("v") - synchronized void method2610(int var1) { - this.method2629(var1, this.method2613()); + @ObfuscatedName("p") + public synchronized void method2659(int var1) { + this.method2661(var1 << 6, this.method2663()); } @ObfuscatedName("n") - synchronized void method2629(int var1, int var2) { - this.field1452 = var1; - this.field1464 = var2; - this.field1461 = 0; - this.method2607(); + synchronized void method2682(int var1) { + this.method2661(var1, this.method2663()); } - @ObfuscatedName("x") - public synchronized int method2612() { - return this.field1452 == Integer.MIN_VALUE ? 0 : this.field1452; + @ObfuscatedName("u") + synchronized void method2661(int var1, int var2) { + this.field1482 = var1; + this.field1483 = var2; + this.field1491 = 0; + this.method2658(); } - @ObfuscatedName("w") - public synchronized int method2613() { - return this.field1464 < 0 ? -1 : this.field1464; + @ObfuscatedName("h") + public synchronized int method2662() { + return this.field1482 == Integer.MIN_VALUE ? 0 : this.field1482; } - @ObfuscatedName("q") - public synchronized void method2622(int var1) { + @ObfuscatedName("g") + public synchronized int method2663() { + return this.field1483 < 0 ? -1 : this.field1483; + } + + @ObfuscatedName("i") + public synchronized void method2664(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -507,267 +503,254 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1462 = var1; + this.field1490 = var1; } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2710() { - this.field1463 = (this.field1463 ^ this.field1463 >> 31) + (this.field1463 >>> 31); - this.field1463 = -this.field1463; + public synchronized void method2655() { + this.field1481 = (this.field1481 ^ this.field1481 >> 31) + (this.field1481 >>> 31); + this.field1481 = -this.field1481; } - @ObfuscatedName("y") - void method2616() { - if (this.field1461 != 0) { - if (this.field1452 == Integer.MIN_VALUE) { - this.field1452 = 0; + @ObfuscatedName("o") + void method2794() { + if (this.field1491 != 0) { + if (this.field1482 == Integer.MIN_VALUE) { + this.field1482 = 0; } - this.field1461 = 0; - this.method2607(); + this.field1491 = 0; + this.method2658(); } } - @ObfuscatedName("f") - public synchronized void method2614(int var1, int var2) { - this.method2618(var1, var2, this.method2613()); + @ObfuscatedName("c") + public synchronized void method2666(int var1, int var2) { + this.method2704(var1, var2, this.method2663()); } - @ObfuscatedName("a") - public synchronized void method2618(int var1, int var2, int var3) { + @ObfuscatedName("f") + public synchronized void method2704(int var1, int var2, int var3) { if (var1 == 0) { - this.method2629(var2, var3); + this.method2661(var2, var3); } else { - int var4 = method2728(var2, var3); - int var5 = method2603(var2, var3); - if (var4 == this.field1455 && var5 == this.field1456) { - this.field1461 = 0; + int var4 = method2721(var2, var3); + int var5 = method2652(var2, var3); + if (var4 == this.field1489 && var5 == this.field1486) { + this.field1491 = 0; } else { - int var6 = var2 - this.field1454; - if (this.field1454 - var2 > var6) { - var6 = this.field1454 - var2; + int var6 = var2 - this.field1484; + if (this.field1484 - var2 > var6) { + var6 = this.field1484 - var2; } - if (var4 - this.field1455 > var6) { - var6 = var4 - this.field1455; + if (var4 - this.field1489 > var6) { + var6 = var4 - this.field1489; } - if (this.field1455 - var4 > var6) { - var6 = this.field1455 - var4; + if (this.field1489 - var4 > var6) { + var6 = this.field1489 - var4; } - if (var5 - this.field1456 > var6) { - var6 = var5 - this.field1456; + if (var5 - this.field1486 > var6) { + var6 = var5 - this.field1486; } - if (this.field1456 - var5 > var6) { - var6 = this.field1456 - var5; + if (this.field1486 - var5 > var6) { + var6 = this.field1486 - var5; } if (var1 > var6) { var1 = var6; } - this.field1461 = var1; - this.field1452 = var2; - this.field1464 = var3; - this.field1460 = (var2 - this.field1454) / var1; - this.field1453 = (var4 - this.field1455) / var1; - this.field1451 = (var5 - this.field1456) / var1; + 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; } } } - @ObfuscatedName("u") - public synchronized void method2619(int var1) { + @ObfuscatedName("ae") + public synchronized void method2706(int var1) { if (var1 == 0) { - this.method2610(0); + this.method2682(0); this.remove(); - } else if (this.field1455 == 0 && this.field1456 == 0) { - this.field1461 = 0; - this.field1452 = 0; - this.field1454 = 0; + } else if (this.field1489 == 0 && this.field1486 == 0) { + this.field1491 = 0; + this.field1482 = 0; + this.field1484 = 0; this.remove(); } else { - int var2 = -this.field1454; - if (this.field1454 > var2) { - var2 = this.field1454; + int var2 = -this.field1484; + if (this.field1484 > var2) { + var2 = this.field1484; } - if (-this.field1455 > var2) { - var2 = -this.field1455; + if (-this.field1489 > var2) { + var2 = -this.field1489; } - if (this.field1455 > var2) { - var2 = this.field1455; + if (this.field1489 > var2) { + var2 = this.field1489; } - if (-this.field1456 > var2) { - var2 = -this.field1456; + if (-this.field1486 > var2) { + var2 = -this.field1486; } - if (this.field1456 > var2) { - var2 = this.field1456; + if (this.field1486 > var2) { + var2 = this.field1486; } if (var1 > var2) { var1 = var2; } - this.field1461 = var1; - this.field1452 = Integer.MIN_VALUE; - this.field1460 = -this.field1454 / var1; - this.field1453 = -this.field1455 / var1; - this.field1451 = -this.field1456 / var1; - } - } - - @ObfuscatedName("ae") - public synchronized void method2660(int var1) { - if (this.field1463 < 0) { - this.field1463 = -var1; - } else { - this.field1463 = var1; - } - - } - - @ObfuscatedName("af") - public synchronized int method2621() { - return this.field1463 < 0 ? -this.field1463 : this.field1463; - } - - @ObfuscatedName("av") - public boolean method2674() { - return this.field1462 < 0 || this.field1462 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("al") - public boolean method2712() { - return this.field1461 != 0; - } - - @ObfuscatedName("at") - int method2608(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1461 > 0) { - int var6 = var2 + this.field1461; - if (var6 > var4) { - var6 = var4; - } - - this.field1461 += var2; - if (this.field1463 == 256 && (this.field1462 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2641(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this); - } else { - var2 = method2640(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2738(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this, this.field1463, var5); - } else { - var2 = method2644(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this, this.field1463, var5); - } - - this.field1461 -= var2; - if (this.field1461 != 0) { - return var2; - } - - if (!this.method2631()) { - continue; - } - - return var4; - } - - if (this.field1463 == 256 && (this.field1462 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2638(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this); - } - - return method2681(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2688(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this, this.field1463, var5); - } - - return method2636(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this, this.field1463, var5); + this.field1491 = var1; + this.field1482 = Integer.MIN_VALUE; + this.field1485 = -this.field1484 / var1; + this.field1492 = -this.field1489 / var1; + this.field1494 = -this.field1486 / var1; } } @ObfuscatedName("an") - int method2630(int[] var1, int var2, int var3, int var4, int var5) { + 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.field1461 > 0) { - int var6 = var2 + this.field1461; + if (this.field1491 > 0) { + int var6 = var2 + this.field1491; if (var6 > var4) { var6 = var4; } - this.field1461 += var2; - if (this.field1463 == -256 && (this.field1462 & 255) == 0) { + this.field1491 += var2; + if (this.field1481 == 256 && (this.field1490 & 255) == 0) { if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2747(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this); + 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 = method2642(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this); + var2 = method2710(((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this); } } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2647(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this, this.field1463, var5); + 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 = method2646(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this, this.field1463, var5); + var2 = method2693(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this, this.field1481, var5); } - this.field1461 -= var2; - if (this.field1461 != 0) { + this.field1491 -= var2; + if (this.field1491 != 0) { return var2; } - if (!this.method2631()) { + if (!this.method2786()) { continue; } return var4; } - if (this.field1463 == -256 && (this.field1462 & 255) == 0) { + if (this.field1481 == 256 && (this.field1490 & 255) == 0) { if (PcmPlayer.PcmPlayer_stereo) { - return method2635(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this); + return method2718(0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this); } - return method2743(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 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 method2639(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this, this.field1463, var5); + return method2686(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this, this.field1481, var5); } - return method2708(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this, this.field1463, var5); + return method2691(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, 0, var4, var3, this, this.field1481, var5); } } - @ObfuscatedName("ag") - int vmethod2777() { - int var1 = this.field1454 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field1462 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; - } + @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; + } - return var1 > 255 ? 255 : var1; + 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("ai") - boolean method2631() { - int var1 = this.field1452; + @ObfuscatedName("ax") + boolean method2786() { + int var1 = this.field1482; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -775,97 +758,110 @@ public class RawPcmStream extends PcmStream { var2 = 0; var1 = 0; } else { - var2 = method2728(var1, this.field1464); - var3 = method2603(var1, this.field1464); + var2 = method2721(var1, this.field1483); + var3 = method2652(var1, this.field1483); } - if (var1 == this.field1454 && var2 == this.field1455 && var3 == this.field1456) { - if (this.field1452 == Integer.MIN_VALUE) { - this.field1452 = 0; - this.field1456 = 0; - this.field1455 = 0; - this.field1454 = 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.method2607(); + this.method2658(); return false; } } else { - if (this.field1454 < var1) { - this.field1460 = 1; - this.field1461 = var1 - this.field1454; - } else if (this.field1454 > var1) { - this.field1460 = -1; - this.field1461 = this.field1454 - var1; + 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.field1460 = 0; + this.field1485 = 0; } - if (this.field1455 < var2) { - this.field1453 = 1; - if (this.field1461 == 0 || this.field1461 > var2 - this.field1455) { - this.field1461 = var2 - this.field1455; + if (this.field1489 < var2) { + this.field1492 = 1; + if (this.field1491 == 0 || this.field1491 > var2 - this.field1489) { + this.field1491 = var2 - this.field1489; } - } else if (this.field1455 > var2) { - this.field1453 = -1; - if (this.field1461 == 0 || this.field1461 > this.field1455 - var2) { - this.field1461 = this.field1455 - var2; + } else if (this.field1489 > var2) { + this.field1492 = -1; + if (this.field1491 == 0 || this.field1491 > this.field1489 - var2) { + this.field1491 = this.field1489 - var2; } } else { - this.field1453 = 0; + this.field1492 = 0; } - if (this.field1456 < var3) { - this.field1451 = 1; - if (this.field1461 == 0 || this.field1461 > var3 - this.field1456) { - this.field1461 = var3 - this.field1456; + if (this.field1486 < var3) { + this.field1494 = 1; + if (this.field1491 == 0 || this.field1491 > var3 - this.field1486) { + this.field1491 = var3 - this.field1486; } - } else if (this.field1456 > var3) { - this.field1451 = -1; - if (this.field1461 == 0 || this.field1461 > this.field1456 - var3) { - this.field1461 = this.field1456 - var3; + } else if (this.field1486 > var3) { + this.field1494 = -1; + if (this.field1491 == 0 || this.field1491 > this.field1486 - var3) { + this.field1491 = this.field1486 - var3; } } else { - this.field1451 = 0; + this.field1494 = 0; } return false; } } - @ObfuscatedName("c") - static int method2728(int var0, int var1) { + @ObfuscatedName("ac") + int vmethod2820() { + int var1 = this.field1484 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field1490 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; + } + + return var1 > 255 ? 255 : var1; + } + + @ObfuscatedName("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("t") - static int method2603(int var0, int var1) { + @ObfuscatedName("m") + static int method2652(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lcv;II)Lde;" + signature = "(Ldm;II)Ldy;" ) @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.field1398 * 100)), var2 << 6) : null; + 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; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lcv;III)Lde;" + signature = "(Ldm;III)Ldy;" ) - public static RawPcmStream method2673(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2685(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "([B[IIIIIIILde;)I" + signature = "([B[IIIIIIILdy;)I" ) - static int method2681(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2690(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -888,15 +884,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1462 = var2 << 8; + var8.field1490 = var2 << 8; return var3; } - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILde;)I" + signature = "(I[B[IIIIIIIILdy;)I" ) - static int method2638(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + 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) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -939,15 +935,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1462 = var3 << 8; + var10.field1490 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ah") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "([B[IIIIIIILde;)I" + signature = "([B[IIIIIIILdy;)I" ) - static int method2743(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2681(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -970,15 +966,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1462 = var2 << 8; + var8.field1490 = var2 << 8; return var3; } - @ObfuscatedName("bq") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILde;)I" + signature = "(I[B[IIIIIIIILdy;)I" ) - static int method2635(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + 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) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1021,15 +1017,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1462 = var3 << 8; + var10.field1490 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bf") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILde;II)I" + signature = "(II[B[IIIIIIILdy;II)I" ) - static int method2636(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 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) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1054,15 +1050,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1462 = var4; + var10.field1490 = var4; return var5; } - @ObfuscatedName("bc") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIILdy;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 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) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1096,15 +1092,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1462 = var4; + var11.field1490 = var4; return var5 >> 1; } - @ObfuscatedName("bk") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILde;II)I" + signature = "(II[B[IIIIIIILdy;II)I" ) - static int method2708(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 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) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1129,15 +1125,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1462 = var4; + var10.field1490 = var4; return var5; } - @ObfuscatedName("bb") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIILdy;II)I" ) - static int method2639(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 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) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1169,15 +1165,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1462 = var4; + var11.field1490 = var4; return var5 >> 1; } - @ObfuscatedName("bi") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "([B[IIIIIIIILde;)I" + signature = "([B[IIIIIIIILdy;)I" ) - static int method2640(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2710(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1186,8 +1182,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1455 += var9.field1453 * (var6 - var3); - var9.field1456 += var9.field1451 * (var6 - var3); + var9.field1489 += var9.field1492 * (var6 - var3); + var9.field1486 += var9.field1494 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1209,16 +1205,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1454 = var4 >> 2; - var9.field1462 = var2 << 8; + var9.field1484 = var4 >> 2; + var9.field1490 = var2 << 8; return var3; } - @ObfuscatedName("bp") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILde;)I" + signature = "(I[B[IIIIIIIIIILdy;)I" ) - static int method2641(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 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) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1229,7 +1225,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1454 += var12.field1460 * (var9 - var4); + var12.field1484 += var12.field1485 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1274,17 +1270,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1455 = var5 >> 2; - var12.field1456 = var6 >> 2; - var12.field1462 = var3 << 8; + var12.field1489 = var5 >> 2; + var12.field1486 = var6 >> 2; + var12.field1490 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bl") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "([B[IIIIIIIILde;)I" + signature = "([B[IIIIIIIILdy;)I" ) - static int method2642(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2683(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1293,8 +1289,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1455 += var9.field1453 * (var6 - var3); - var9.field1456 += var9.field1451 * (var6 - var3); + var9.field1489 += var9.field1492 * (var6 - var3); + var9.field1486 += var9.field1494 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1316,16 +1312,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1454 = var4 >> 2; - var9.field1462 = var2 << 8; + var9.field1484 = var4 >> 2; + var9.field1490 = var2 << 8; return var3; } - @ObfuscatedName("by") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILde;)I" + signature = "(I[B[IIIIIIIIIILdy;)I" ) - static int method2747(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 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) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1336,7 +1332,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1454 += var12.field1460 * (var9 - var4); + var12.field1484 += var12.field1485 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1381,19 +1377,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1455 = var5 >> 2; - var12.field1456 = var6 >> 2; - var12.field1462 = var3 << 8; + var12.field1489 = var5 >> 2; + var12.field1486 = var6 >> 2; + var12.field1490 = var3 << 8; return var4 >> 1; } @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIILdy;II)I" ) - static int method2644(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1455 -= var11.field1453 * var5; - var11.field1456 -= var11.field1451 * var5; + 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; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1420,19 +1416,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1455 += var11.field1453 * var5; - var11.field1456 += var11.field1451 * var5; - var11.field1454 = var6; - var11.field1462 = var4; + var11.field1489 += var11.field1492 * var5; + var11.field1486 += var11.field1494 * var5; + var11.field1484 = var6; + var11.field1490 = var4; return var5; } - @ObfuscatedName("bw") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIIIILdy;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, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field1454 -= var5 * var13.field1460; + 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; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1471,20 +1467,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1454 += var13.field1460 * var5; - var13.field1455 = var6; - var13.field1456 = var7; - var13.field1462 = var4; + var13.field1484 += var13.field1485 * var5; + var13.field1489 = var6; + var13.field1486 = var7; + var13.field1490 = var4; return var5; } @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIILdy;II)I" ) - static int method2646(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1455 -= var11.field1453 * var5; - var11.field1456 -= var11.field1451 * var5; + 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; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1511,19 +1507,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1455 += var11.field1453 * var5; - var11.field1456 += var11.field1451 * var5; - var11.field1454 = var6; - var11.field1462 = var4; + var11.field1489 += var11.field1492 * var5; + var11.field1486 += var11.field1494 * var5; + var11.field1484 = var6; + var11.field1490 = var4; return var5; } - @ObfuscatedName("bn") + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILde;II)I" + signature = "(II[B[IIIIIIIIIILdy;II)I" ) - static int method2647(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.field1454 -= var5 * var13.field1460; + 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; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1560,10 +1556,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1454 += var13.field1460 * var5; - var13.field1455 = var6; - var13.field1456 = var7; - var13.field1462 = var4; + var13.field1484 += var13.field1485 * var5; + var13.field1489 = var6; + var13.field1486 = var7; + var13.field1490 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 11dd92d328..afa7e2576e 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("cv") +@ObfuscatedName("dm") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("samples") public byte[] samples; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("start") public int start; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("end") int end; - @ObfuscatedName("i") - public boolean field1379; + @ObfuscatedName("w") + public boolean field1407; 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.field1379 = var5; + this.field1407 = var5; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldj;)Lcv;" + signature = "(Ldx;)Ldm;" ) @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 936ad7319d..9dc668f5cd 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -5,148 +5,66 @@ 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("cc") +@ObfuscatedName("du") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("qz") - @ObfuscatedGetter( - intValue = -799338112 - ) - static int field1319; - @ObfuscatedName("by") + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "[Lli;" + signature = "[Lla;" ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("c") + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -677956283 + intValue = 1911756689 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("arguments") + byte[][][] arguments; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1081173073 + intValue = -28201163 ) @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("d") @Export("operations") int[] operations; - @ObfuscatedName("e") + @ObfuscatedName("w") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("i") + @ObfuscatedName("v") @Export("fields") Field[] fields; - @ObfuscatedName("g") + @ObfuscatedName("q") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("methods") Method[] methods; - @ObfuscatedName("l") - @Export("arguments") - byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("av") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1634047659" + signature = "(B)V", + garbageValue = "100" ) - static int method2348(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - class320.Interpreter_intStackSize -= 2; - Client.field908 = (short)GrandExchangeEvent.method97(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]); - if (Client.field908 <= 0) { - Client.field908 = 256; - } + static void method2396() { + Login.loginIndex = 24; + HealthBarUpdate.setLoginResponseString("", "You were disconnected from the server.", ""); + } - Client.field897 = (short)GrandExchangeEvent.method97(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - if (Client.field897 <= 0) { - Client.field897 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - class320.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - class320.Interpreter_intStackSize -= 4; - Client.field900 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - if (Client.field900 <= 0) { - Client.field900 = 1; - } - - Client.field673 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - if (Client.field673 <= 0) { - Client.field673 = 32767; - } else if (Client.field673 < Client.field900) { - Client.field673 = Client.field900; - } - - Client.field819 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - if (Client.field819 <= 0) { - Client.field819 = 1; - } - - Client.field903 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - if (Client.field903 <= 0) { - Client.field903 = 32767; - } else if (Client.field903 < Client.field819) { - Client.field903 = Client.field819; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - GrandExchangeOfferUnitPriceComparator.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.method3499(Client.field908); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.method3499(Client.field897); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Username.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.canvasHeight; - return 1; - } else { - return 2; - } + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(Ldg;S)V", + garbageValue = "-25430" + ) + public static final void method2397(class108 var0) { + PcmPlayer.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index bfe4d3ff54..f5aedf1c92 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.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("fk") +@ObfuscatedName("gx") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("cz") - @ObfuscatedGetter( - intValue = -1462817165 + @ObfuscatedName("jz") + @ObfuscatedSignature( + signature = "Lhe;" ) - public static int field2102; - @ObfuscatedName("c") + static Widget field2106; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1839542313 + intValue = 326663409 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1525294437 + intValue = -1533837037 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -860662491 + intValue = 50701303 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1587561283 + intValue = 695146693 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -40,170 +43,53 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIILfv;B)Z", - garbageValue = "50" + signature = "(IIILfm;B)Z", + garbageValue = "-112" ) @Export("hasArrived") - protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("ht") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-47058796" + signature = "(B)I", + garbageValue = "42" ) - static final void method3662(int var0, int var1, int var2, int var3) { - TileItemPile.method2835(); - } + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (GameShell.garbageCollector == null || !GameShell.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - @ObfuscatedName("hl") - @ObfuscatedSignature( - signature = "(IIIIIB)V", - garbageValue = "67" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = ServerBuild.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { - var7 = ServerBuild.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (KeyHandler.method850(var5)) { - var10 = var4; - } - - int[] var11 = WorldMapRectangle.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = GrandExchangeEvents.Entity_unpackID(var5); - ObjectDefinition var14 = Occluder.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = VertexNormal.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var16 + var1 * 4 + 48, (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; + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + GameShell.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; } } + } catch (Throwable var11) { } } - var5 = ServerBuild.scene.getGameObjectTag(var0, var1, var2); - if (0L != var5) { - var7 = ServerBuild.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = GrandExchangeEvents.Entity_unpackID(var5); - ObjectDefinition var24 = Occluder.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = VertexNormal.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 (KeyHandler.method850(var5)) { - var12 = 15597568; - } - - int[] var23 = WorldMapRectangle.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 = ServerBuild.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = GrandExchangeEvents.Entity_unpackID(var5); - ObjectDefinition var20 = Occluder.getObjectDefinition(var7); - if (var20.mapSceneId != -1) { - IndexedSprite var21 = VertexNormal.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, var22 + (104 - var2 - var20.sizeY) * 4 + 48); + 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; } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 4ff4530872..d0dda3b0cf 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,25 +4,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mo") +@ObfuscatedName("mf") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 83275543 + intValue = 858852849 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -834136847 ) @Export("clientType") public static int clientType; - @ObfuscatedName("g") + @ObfuscatedName("q") + @Export("ByteArrayPool_alternativeSizes") + public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("w") @Export("message") String message; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 503ff1e55b..0973e1472a 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("em") +@ObfuscatedName("ej") @Implements("Scene") public class Scene { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("z") + @ObfuscatedName("b") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("y") + @ObfuscatedName("l") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("f") + @ObfuscatedName("r") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("b") + @ObfuscatedName("o") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("s") + @ObfuscatedName("j") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("a") + @ObfuscatedName("y") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("Scene_cameraZ") static int Scene_cameraZ; @ObfuscatedName("ae") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "[Lea;" + signature = "[Lek;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; @ObfuscatedName("as") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("viewportWalking") static boolean viewportWalking; @ObfuscatedName("av") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "[[Ler;" + signature = "[[Lem;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("am") + @ObfuscatedName("ax") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("ao") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "[Ler;" + signature = "[Lem;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("an") - static final int[] field1842; - @ObfuscatedName("ag") - static final int[] field1843; - @ObfuscatedName("ai") - static final int[] field1844; - @ObfuscatedName("ab") - static final int[] field1845; - @ObfuscatedName("ap") - static final int[] field1846; + @ObfuscatedName("ay") + static final int[] field1856; + @ObfuscatedName("ad") + static final int[] field1870; + @ObfuscatedName("ac") + static final int[] field1858; @ObfuscatedName("ah") - static final int[] field1847; - @ObfuscatedName("bq") - static final int[] field1848; - @ObfuscatedName("bl") + static final int[] field1820; + @ObfuscatedName("ag") + static final int[] field1842; + @ObfuscatedName("aw") + static final int[] field1861; + @ObfuscatedName("bf") + static final int[] field1814; + @ObfuscatedName("bg") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("by") + @ObfuscatedName("bt") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("be") + @ObfuscatedName("bh") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bw") + @ObfuscatedName("br") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bt") + @ObfuscatedName("bq") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bm") + @ObfuscatedName("bv") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("ba") + @ObfuscatedName("bx") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("xSize") int xSize; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("ySize") int ySize; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[[[Ldz;" + signature = "[[[Leq;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lea;" + signature = "[Lek;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("m") - int[][][] field1805; - @ObfuscatedName("bi") + @ObfuscatedName("e") + int[][][] field1819; + @ObfuscatedName("bu") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bp") + @ObfuscatedName("be") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1842 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1843 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1844 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1845 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1846 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1847 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1848 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + 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}; 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.field1805 = new int[var1][var2 + 1][var3 + 1]; + this.field1819 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,7 +291,10 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - if (HealthBarUpdate.method1757(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + long var9 = var7.tag; + int var11 = (int)(var9 >>> 14 & 3L); + boolean var8 = var11 == 2; + if (var8 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -306,7 +309,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -315,7 +318,7 @@ public class Scene { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; @@ -353,9 +356,9 @@ public class Scene { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIILeq;JI)V" + signature = "(IIIILee;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -375,9 +378,9 @@ public class Scene { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIIILeq;JLeq;Leq;)V" + signature = "(IIIILee;JLee;Lee;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { @@ -411,9 +414,9 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIILeq;Leq;IIJI)V" + signature = "(IIIILee;Lee;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) { @@ -422,7 +425,7 @@ public class Scene { var12.tag = var9; var12.flags = var11; var12.x = var2 * 128 + 64; - var12.y = var3 * 134217728 + 67108864; + var12.y = var3 * 128 + 64; var12.tileHeight = var4; var12.entity1 = var5; var12.entity2 = var6; @@ -439,9 +442,9 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIILeq;Leq;IIIIJI)V" + signature = "(IIIILee;Lee;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) { @@ -450,7 +453,7 @@ public class Scene { var14.tag = var11; var14.flags = var13; var14.x = var2 * 128 + 64; - var14.y = var3 * -2013265920 + 1140850688; + var14.y = var3 * 128 + 64; var14.tileHeight = var4; var14.entity1 = var5; var14.entity2 = var6; @@ -469,11 +472,11 @@ public class Scene { } } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIIIILeq;IJI)Z" + signature = "(IIIIIILee;IJI)Z" ) - public boolean method3165(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + public boolean method3187(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -483,9 +486,9 @@ public class Scene { } } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIILeq;IJZ)Z" + signature = "(IIIIILee;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { @@ -522,18 +525,18 @@ public class Scene { } } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIIILeq;IJIIII)Z" + signature = "(IIIIILee;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("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIIIIIILeq;IZJI)Z" + signature = "(IIIIIIIILee;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) { @@ -605,7 +608,7 @@ public class Scene { return true; } - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -617,9 +620,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lea;)V" + signature = "(Lek;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -653,8 +656,8 @@ public class Scene { } - @ObfuscatedName("q") - public void method3171(int var1, int var2, int var3, int var4) { + @ObfuscatedName("i") + public void method3210(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -665,7 +668,7 @@ public class Scene { } } - @ObfuscatedName("z") + @ObfuscatedName("a") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -674,7 +677,7 @@ public class Scene { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -683,14 +686,17 @@ public class Scene { } } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + int var10 = (int)(var8 >>> 14 & 3L); + boolean var7 = var10 == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -699,7 +705,7 @@ public class Scene { } } - @ObfuscatedName("a") + @ObfuscatedName("f") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -708,7 +714,7 @@ public class Scene { } } - @ObfuscatedName("u") + @ObfuscatedName("ae") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -717,36 +723,39 @@ public class Scene { } } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(III)Leu;" + signature = "(III)Lep;" ) - public BoundaryObject method3177(int var1, int var2, int var3) { + public BoundaryObject method3199(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(III)Len;" + signature = "(III)Lez;" ) - public WallDecoration method3178(int var1, int var2, int var3) { + public WallDecoration method3252(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(III)Lea;" + signature = "(III)Lek;" ) - public GameObject method3203(int var1, int var2, int var3) { + public GameObject method3201(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return null; } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + int var10 = (int)(var8 >>> 14 & 3L); + boolean var7 = var10 == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -755,9 +764,9 @@ public class Scene { } } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(III)Ldu;" + signature = "(III)Leo;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -765,21 +774,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @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("au") + @ObfuscatedName("af") @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("ay") + @ObfuscatedName("at") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -788,7 +797,10 @@ public class Scene { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + int var10 = (int)(var8 >>> 14 & 3L); + boolean var7 = var10 == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -797,14 +809,14 @@ public class Scene { } } - @ObfuscatedName("aa") + @ObfuscatedName("as") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("aq") + @ObfuscatedName("am") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -827,8 +839,8 @@ public class Scene { } } - @ObfuscatedName("as") - public void method3186(int var1, int var2, int var3) { + @ObfuscatedName("au") + public void method3262(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -838,11 +850,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.entity1 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1; - this.method3212(var9, var4, var5, var6, 1, 1); + this.method3209(var9, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) { var10 = (ModelData)var8.entity2; - this.method3212(var10, var4, var5, var6, 1, 1); - ModelData.method2849(var9, var10, 0, 0, 0, false); + this.method3209(var10, var4, var5, var6, 1, 1); + ModelData.method2890(var9, var10, 0, 0, 0, false); var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -853,7 +865,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.entity instanceof ModelData) { ModelData var11 = (ModelData)var14.entity; - this.method3212(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method3209(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -861,7 +873,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.entity instanceof ModelData) { var10 = (ModelData)var13.entity; - this.method3187(var10, var4, var5, var6); + this.method3308(var10, var4, var5, var6); var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -871,18 +883,18 @@ public class Scene { } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ldg;III)V" + signature = "(Lea;III)V" ) - void method3187(ModelData var1, int var2, int var3, int var4) { + void method3308(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.method2849(var1, var6, 128, 0, 0, true); + ModelData.method2890(var1, var6, 128, 0, 0, true); } } @@ -890,7 +902,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.method2849(var1, var6, 0, 0, 128, true); + ModelData.method2890(var1, var6, 0, 0, 128, true); } } @@ -898,7 +910,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.method2849(var1, var6, 128, 0, 128, true); + ModelData.method2890(var1, var6, 128, 0, 128, true); } } @@ -906,17 +918,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.method2849(var1, var6, 128, 0, -128, true); + ModelData.method2890(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Ldg;IIIII)V" + signature = "(Lea;IIIII)V" ) - void method3212(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3209(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -937,12 +949,12 @@ public class Scene { ModelData var18; if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; - ModelData.method2849(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2890(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.method2849(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2890(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -952,7 +964,7 @@ public class Scene { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method2849(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method2890(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -968,7 +980,7 @@ public class Scene { } - @ObfuscatedName("aw") + @ObfuscatedName("av") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1033,10 +1045,10 @@ public class Scene { } } - @ObfuscatedName("al") + @ObfuscatedName("ax") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3321() || var4) { + if (!method3215() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1047,13 +1059,13 @@ public class Scene { } } - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1120,11 +1132,7 @@ 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) { - var11.drawPrimary = false; - var11.drawSecondary = false; - var11.drawGameObjectEdges = 0; - } else { + if (var11.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { var11.drawPrimary = true; var11.drawSecondary = true; if (var11.gameObjectsCount > 0) { @@ -1134,6 +1142,10 @@ public class Scene { } ++tileUpdateCount; + } else { + var11.drawPrimary = false; + var11.drawSecondary = false; + var11.drawGameObjectEdges = 0; } } } @@ -1250,9 +1262,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("an") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(Ldz;Z)V" + signature = "(Leq;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1346,16 +1358,16 @@ public class Scene { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method3218(0, var4, var5)) { + if (!this.method3177(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3218(0, var4, var5)) { + } else if (var9.model != null && !this.method3177(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } var10 = var9.boundaryObject; if (var10 != null) { - var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 64 - Scene_cameraZ, var10.tag); + 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); } for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { @@ -1368,13 +1380,13 @@ public class Scene { var20 = false; if (var3.paint != null) { - if (!this.method3218(var7, var4, var5)) { + if (!this.method3177(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.method3218(var7, var4, var5)) { + } else if (var3.model != null && !this.method3177(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1396,49 +1408,49 @@ public class Scene { var21 += 6; } - var11 = field1842[var21]; - var3.field1652 = field1844[var21]; + var11 = field1856[var21]; + var3.field1680 = field1858[var21]; } if (var31 != null) { - if ((var31.orientationA & field1843[var21]) != 0) { + if ((var31.orientationA & field1870[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1650 = field1845[var21]; - var3.field1640 = 3 - var3.field1650; + var3.field1678 = field1820[var21]; + var3.field1679 = 3 - var3.field1678; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1650 = field1846[var21]; - var3.field1640 = 6 - var3.field1650; + var3.field1678 = field1842[var21]; + var3.field1679 = 6 - var3.field1678; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1650 = field1847[var21]; - var3.field1640 = 12 - var3.field1650; + var3.field1678 = field1861[var21]; + var3.field1679 = 12 - var3.field1678; } else { var3.drawGameObjectEdges = 9; - var3.field1650 = field1848[var21]; - var3.field1640 = 9 - var3.field1650; + var3.field1678 = field1814[var21]; + var3.field1679 = 9 - var3.field1678; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3204(var7, var4, var5, var31.orientationA)) { - var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 64 - Scene_cameraZ, var31.tag); + if ((var31.orientationA & var11) != 0 && !this.method3303(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.method3204(var7, var4, var5, var31.orientationB)) { - var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 64 - Scene_cameraZ, var31.tag); + if ((var31.orientationB & var11) != 0 && !this.method3303(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.method3205(var7, var4, var5, var13.entity1.height)) { + if (var13 != null && !this.method3226(var7, var4, var5, var13.entity1.height)) { if ((var13.orientation & var11) != 0) { - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.xOffset + (var13.x * 4096 - Scene_cameraX), var13.tileHeight - Scene_cameraY, var13.y * 64 - Scene_cameraZ + var13.yOffset, var13.tag); + 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) { - var14 = var13.x * 4096 - Scene_cameraX; + var14 = var13.x - Scene_cameraX; var15 = var13.tileHeight - Scene_cameraY; - var16 = var13.y * 64 - Scene_cameraZ; + var16 = var13.y - Scene_cameraZ; var17 = var13.orientation2; if (var17 != 1 && var17 != 2) { var18 = var14; @@ -1464,21 +1476,21 @@ public class Scene { if (var20) { FloorDecoration var22 = var3.floorDecoration; if (var22 != null) { - var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x * 4096 - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y * 4096 - Scene_cameraZ, var22.tag); + var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } TileItemPile var23 = var3.tileItemPile; if (var23 != null && var23.height == 0) { if (var23.second != null) { - var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } if (var23.third != null) { - var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } if (var23.first != null) { - var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } @@ -1520,7 +1532,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.field1650) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1678) { var20 = false; break; } @@ -1528,8 +1540,8 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method3204(var7, var4, var5, var10.orientationA)) { - var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 64 - Scene_cameraZ, var10.tag); + if (!this.method3303(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); } var3.drawGameObjectEdges = 0; @@ -1575,7 +1587,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1640) { + if ((var16 & var36.drawGameObjectEdges) == var3.field1679) { var3.drawGameObjects = true; continue label563; } @@ -1593,9 +1605,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field1931 = var24 + var16; + var12.field1950 = var24 + var16; } else { - var12.field1931 = var24 + var15; + var12.field1950 = var24 + var15; } } } @@ -1607,10 +1619,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1931 > var11) { - var11 = var35.field1931; + if (var35.field1950 > var11) { + var11 = var35.field1950; var25 = var24; - } else if (var11 == var35.field1931) { + } else if (var11 == var35.field1950) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1628,7 +1640,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method3206(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method3227(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1688,27 +1700,27 @@ public class Scene { TileItemPile var32 = var3.tileItemPile; if (var32 != null && var32.height != 0) { if (var32.second != null) { - var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } if (var32.third != null) { - var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } if (var32.first != null) { - var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field1652 != 0) { + if (var3.field1680 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3205(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1652) != 0) { - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.xOffset + (var29.x * 4096 - Scene_cameraX), var29.tileHeight - Scene_cameraY, var29.y * 64 - Scene_cameraZ + var29.yOffset, var29.tag); + if (var29 != null && !this.method3226(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1680) != 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 * 4096 - Scene_cameraX; + var11 = var29.x - Scene_cameraX; var25 = var29.tileHeight - Scene_cameraY; - var24 = var29.y * 64 - Scene_cameraZ; + var24 = var29.y - Scene_cameraZ; var14 = var29.orientation2; if (var14 != 1 && var14 != 2) { var15 = var11; @@ -1732,12 +1744,12 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1652) != 0 && !this.method3204(var7, var4, var5, var27.orientationB)) { - var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 64 - Scene_cameraZ, var27.tag); + if ((var27.orientationB & var3.field1680) != 0 && !this.method3303(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.field1652) != 0 && !this.method3204(var7, var4, var5, var27.orientationA)) { - var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 64 - Scene_cameraZ, var27.tag); + if ((var27.orientationA & var3.field1680) != 0 && !this.method3303(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); } } } @@ -1780,9 +1792,9 @@ public class Scene { } } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Lee;IIIIIII)V" + signature = "(Lev;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1836,9 +1848,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1761 = false; + Rasterizer3D.field1778 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1761 = true; + Rasterizer3D.field1778 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1848,7 +1860,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method3116(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method3105(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1858,14 +1870,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3116(var27, var29, var25, var26, var28, var24, method3274(var30, var1.neColor), method3274(var30, var1.nwColor), method3274(var30, var1.seColor)); + Rasterizer3D.method3105(var27, var29, var25, var26, var28, var24, method3221(var30, var1.neColor), method3221(var30, var1.nwColor), method3221(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1761 = false; + Rasterizer3D.field1778 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1761 = true; + Rasterizer3D.field1778 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1875,13 +1887,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method3116(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method3105(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.method3116(var23, var25, var29, var22, var24, var28, method3274(var30, var1.swColor), method3274(var30, var1.seColor), method3274(var30, var1.nwColor)); + Rasterizer3D.method3105(var23, var25, var29, var22, var24, var28, method3221(var30, var1.swColor), method3221(var30, var1.seColor), method3221(var30, var1.nwColor)); } } @@ -1891,9 +1903,9 @@ public class Scene { } } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ldt;IIIIII)V" + signature = "(Lex;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1918,13 +1930,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1575[var9] = var10; - TileModel.field1593[var9] = var13; - TileModel.field1594[var9] = var12; + TileModel.field1613[var9] = var10; + TileModel.field1623[var9] = var13; + TileModel.field1620[var9] = var12; } - TileModel.field1590[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1584[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1615[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1605[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1934,16 +1946,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1590[var10]; - int var14 = TileModel.field1590[var11]; - int var15 = TileModel.field1590[var12]; - int var16 = TileModel.field1584[var10]; - int var17 = TileModel.field1584[var11]; - int var18 = TileModel.field1584[var12]; + 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]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1761 = false; + Rasterizer3D.field1778 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1761 = true; + Rasterizer3D.field1778 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1954,23 +1966,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.field1575[0], TileModel.field1575[1], TileModel.field1575[3], TileModel.field1593[0], TileModel.field1593[1], TileModel.field1593[3], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], var1.triangleTextureId[var9]); + 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]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1575[var10], TileModel.field1575[var11], TileModel.field1575[var12], TileModel.field1593[var10], TileModel.field1593[var11], TileModel.field1593[var12], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], var1.triangleTextureId[var9]); + 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]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3116(var16, var17, var18, var13, var14, var15, method3274(var19, var1.triangleColorA[var9]), method3274(var19, var1.triangleColorB[var9]), method3274(var19, var1.triangleColorC[var9])); + Rasterizer3D.method3105(var16, var17, var18, var13, var14, var15, method3221(var19, var1.triangleColorA[var9]), method3221(var19, var1.triangleColorB[var9]), method3221(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3116(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method3105(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("ah") + @ObfuscatedName("bc") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2009,20 +2021,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field1891 = 1; + var4.field1916 = 1; } else { if (var9 >= -32) { continue; } - var4.field1891 = 2; + var4.field1916 = 2; var9 = -var9; } - var4.field1903 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1904 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1889 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1905 = (var4.maxY - Scene_cameraY << 8) / 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; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2051,20 +2063,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field1891 = 3; + var4.field1916 = 3; } else { if (var9 >= -32) { continue; } - var4.field1891 = 4; + var4.field1916 = 4; var9 = -var9; } - var4.field1900 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1901 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1889 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1905 = (var4.maxY - Scene_cameraY << 8) / 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; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2094,22 +2106,22 @@ public class Scene { boolean var10 = false; - label144: + label163: for (int var11 = var8; var11 <= var9; ++var11) { for (int var12 = var6; var12 <= var7; ++var12) { if (visibleTiles[var11][var12]) { var10 = true; - break label144; + break label163; } } } if (var10) { - var4.field1891 = 5; - var4.field1900 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1901 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1903 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1904 = (var4.maxZ - Scene_cameraZ << 8) / var5; + 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; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2119,9 +2131,9 @@ public class Scene { } - @ObfuscatedName("bq") - boolean method3218(int var1, int var2, int var3) { - int var4 = this.field1805[var1][var2][var3]; + @ObfuscatedName("bo") + boolean method3177(int var1, int var2, int var3) { + int var4 = this.field1819[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2129,19 +2141,19 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method3207(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3207(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1805[var1][var2][var3] = Scene_drawnCount; + 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; return true; } else { - this.field1805[var1][var2][var3] = -Scene_drawnCount; + this.field1819[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bf") - boolean method3204(int var1, int var2, int var3, int var4) { - if (!this.method3218(var1, var2, var3)) { + @ObfuscatedName("bd") + boolean method3303(int var1, int var2, int var3, int var4) { + if (!this.method3177(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2153,30 +2165,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method3207(var5, var7, var6)) { + if (!this.method3228(var5, var7, var6)) { return false; } - if (!this.method3207(var5, var7, var6 + 128)) { + if (!this.method3228(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3207(var5, var8, var6)) { + if (!this.method3228(var5, var8, var6)) { return false; } - if (!this.method3207(var5, var8, var6 + 128)) { + if (!this.method3228(var5, var8, var6 + 128)) { return false; } } - if (!this.method3207(var5, var9, var6)) { + if (!this.method3228(var5, var9, var6)) { return false; } - if (!this.method3207(var5, var9, var6 + 128)) { + if (!this.method3228(var5, var9, var6 + 128)) { return false; } @@ -2185,30 +2197,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method3207(var5, var7, var6 + 128)) { + if (!this.method3228(var5, var7, var6 + 128)) { return false; } - if (!this.method3207(var5 + 128, var7, var6 + 128)) { + if (!this.method3228(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3207(var5, var8, var6 + 128)) { + if (!this.method3228(var5, var8, var6 + 128)) { return false; } - if (!this.method3207(var5 + 128, var8, var6 + 128)) { + if (!this.method3228(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3207(var5, var9, var6 + 128)) { + if (!this.method3228(var5, var9, var6 + 128)) { return false; } - if (!this.method3207(var5 + 128, var9, var6 + 128)) { + if (!this.method3228(var5 + 128, var9, var6 + 128)) { return false; } @@ -2217,30 +2229,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method3207(var5 + 128, var7, var6)) { + if (!this.method3228(var5 + 128, var7, var6)) { return false; } - if (!this.method3207(var5 + 128, var7, var6 + 128)) { + if (!this.method3228(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3207(var5 + 128, var8, var6)) { + if (!this.method3228(var5 + 128, var8, var6)) { return false; } - if (!this.method3207(var5 + 128, var8, var6 + 128)) { + if (!this.method3228(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3207(var5 + 128, var9, var6)) { + if (!this.method3228(var5 + 128, var9, var6)) { return false; } - if (!this.method3207(var5 + 128, var9, var6 + 128)) { + if (!this.method3228(var5 + 128, var9, var6 + 128)) { return false; } @@ -2249,30 +2261,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method3207(var5, var7, var6)) { + if (!this.method3228(var5, var7, var6)) { return false; } - if (!this.method3207(var5 + 128, var7, var6)) { + if (!this.method3228(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method3207(var5, var8, var6)) { + if (!this.method3228(var5, var8, var6)) { return false; } - if (!this.method3207(var5 + 128, var8, var6)) { + if (!this.method3228(var5 + 128, var8, var6)) { return false; } } - if (!this.method3207(var5, var9, var6)) { + if (!this.method3228(var5, var9, var6)) { return false; } - if (!this.method3207(var5 + 128, var9, var6)) { + if (!this.method3228(var5 + 128, var9, var6)) { return false; } @@ -2280,49 +2292,49 @@ public class Scene { } } - if (!this.method3207(var5 + 64, var10, var6 + 64)) { + if (!this.method3228(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method3207(var5, var9, var6 + 128); + return this.method3228(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method3207(var5 + 128, var9, var6 + 128); + return this.method3228(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method3207(var5 + 128, var9, var6); + return this.method3228(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method3207(var5, var9, var6); + return this.method3228(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("bc") - boolean method3205(int var1, int var2, int var3, int var4) { - if (!this.method3218(var1, var2, var3)) { + @ObfuscatedName("bk") + boolean method3226(int var1, int var2, int var3, int var4) { + if (!this.method3177(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method3207(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3207(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + 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); } } - @ObfuscatedName("bk") - boolean method3206(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bu") + boolean method3227(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method3218(var1, var2, var4)) { + if (!this.method3177(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method3207(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3207(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + 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); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field1805[var1][var7][var8] == -Scene_drawnCount) { + if (this.field1819[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2331,17 +2343,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3207(var7, var9, var8)) { + if (!this.method3228(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method3207(var10, var9, var8)) { + if (!this.method3228(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method3207(var7, var9, var11)) { + if (!this.method3228(var7, var9, var11)) { return false; - } else if (!this.method3207(var10, var9, var11)) { + } else if (!this.method3228(var10, var9, var11)) { return false; } else { return true; @@ -2351,8 +2363,8 @@ public class Scene { } } - @ObfuscatedName("bb") - boolean method3207(int var1, int var2, int var3) { + @ObfuscatedName("be") + boolean method3228(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2360,57 +2372,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field1891 == 1) { + if (var5.field1916 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field1903 >> 8) + var5.minZ; - var8 = (var6 * var5.field1904 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1889 >> 8) + var5.minY; - var10 = (var6 * var5.field1905 >> 8) + var5.maxY; + 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; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1891 == 2) { + } else if (var5.field1916 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field1903 >> 8) + var5.minZ; - var8 = (var6 * var5.field1904 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1889 >> 8) + var5.minY; - var10 = (var6 * var5.field1905 >> 8) + var5.maxY; + 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; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1891 == 3) { + } else if (var5.field1916 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field1900 >> 8) + var5.minX; - var8 = (var6 * var5.field1901 >> 8) + var5.maxX; - var9 = (var6 * var5.field1889 >> 8) + var5.minY; - var10 = (var6 * var5.field1905 >> 8) + var5.maxY; + 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; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1891 == 4) { + } else if (var5.field1916 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field1900 >> 8) + var5.minX; - var8 = (var6 * var5.field1901 >> 8) + var5.maxX; - var9 = (var6 * var5.field1889 >> 8) + var5.minY; - var10 = (var6 * var5.field1905 >> 8) + var5.maxY; + 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; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1891 == 5) { + } else if (var5.field1916 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field1900 >> 8) + var5.minX; - var8 = (var6 * var5.field1901 >> 8) + var5.maxX; - var9 = (var6 * var5.field1903 >> 8) + var5.minZ; - var10 = (var6 * var5.field1904 >> 8) + var5.maxZ; + 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; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2421,7 +2433,7 @@ public class Scene { return false; } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2439,7 +2451,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ar") + @ObfuscatedName("ak") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2472,7 +2484,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3190(var12, var0[var8] + var15, var13)) { + if (method3212(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2523,8 +2535,8 @@ public class Scene { } - @ObfuscatedName("av") - static boolean method3190(int var0, int var1, int var2) { + @ObfuscatedName("aa") + static boolean method3212(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2538,19 +2550,19 @@ public class Scene { } } - @ObfuscatedName("am") - public static boolean method3321() { + @ObfuscatedName("aj") + public static boolean method3215() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("ao") - public static void method3279() { + @ObfuscatedName("ay") + public static void method3347() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("ab") - static final int method3274(int var0, int var1) { + @ObfuscatedName("aw") + static final int method3221(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2561,7 +2573,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("ap") + @ObfuscatedName("bf") @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 8dfc6590c5..29129c5b38 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -7,48 +7,57 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ce") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("t") + @ObfuscatedName("ej") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "Lkx;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("m") @Export("opcodes") int[] opcodes; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("intOperands") int[] intOperands; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1871581323 + intValue = -1902344849 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 822375411 + intValue = -1904164233 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1252836573 + intValue = -335811903 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1735199639 + intValue = 931655197 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Llp;" + signature = "[Lln;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -60,38 +69,23 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)[Llp;", - garbageValue = "1" + signature = "(II)[Lln;", + garbageValue = "-1946257941" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("kh") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIILlt;Lhf;I)V", - garbageValue = "631816704" + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "1255823265" ) - @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 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method6207(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); - } - - } - } + @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 eba0bf3bdb..1c2fa8c48b 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -1,75 +1,77 @@ -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("bw") +@ObfuscatedName("bb") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("ef") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("c") + @ObfuscatedName("km") + @ObfuscatedGetter( + intValue = -2032356267 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("x") @Export("args") Object[] args; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhe;" ) @Export("widget") Widget widget; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1331050905 + intValue = 662449011 ) @Export("mouseX") int mouseX; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1279210295 + intValue = 1491668133 ) @Export("mouseY") int mouseY; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1465065173 + intValue = -44479267 ) @Export("opIndex") int opIndex; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhe;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -268491807 + intValue = 128989033 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1412457419 + intValue = 1018201725 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("targetName") String targetName; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 171881153 + ) + int field604; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1385894557 - ) - int field582; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -891059655 + intValue = -893996953 ) @Export("type") int type; @@ -78,80 +80,59 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([Ljava/lang/Object;I)V", - garbageValue = "-2105798075" + garbageValue = "-1877597946" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "350345560" + signature = "(IB)V", + garbageValue = "77" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("i") + @ObfuscatedName("kv") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II)I", - garbageValue = "2038755818" + signature = "(IIIILla;Lhg;B)V", + garbageValue = "-20" ) - public static int method1202(CharSequence var0, int var1) { - return KitDefinition.parseIntCustomRadix(var0, var1, true); - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "43843350" - ) - static void method1203(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class192.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class192.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeShort(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(var3[var6]); - var8.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(var3[var6]); - var8.packetBuffer.method5602(0); - Client.packetWriter.addNode(var8); + @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); } - var4 = true; - break; } } + } - if (!var4) { - ClientPreferences.addGameMessage(4, "", "Unable to find " + var1); - } - + @ObfuscatedName("kc") + @ObfuscatedSignature( + signature = "(Lhe;I)I", + garbageValue = "-1130493417" + ) + @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; } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 6a320b4d64..e644679ee9 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,31 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bv") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lce;" ) @Export("script") Script script; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -424456735 + intValue = -1351429101 ) @Export("pc") int pc; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("intLocals") int[] intLocals; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("stringLocals") String[] stringLocals; @@ -36,308 +30,204 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("e") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1752318627" + signature = "(II)V", + garbageValue = "-1106697441" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (class197.Widget_loadedInterfaces[var0]) { - return true; - } else if (!class197.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = class197.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - class197.Widget_loadedInterfaces[var0] = true; - return true; + static void method1242(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); + } + } + + @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 (WorldMapLabel.Widget_interfaceComponents[var0] == null) { - WorldMapLabel.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (WorldMapLabel.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = class197.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - WorldMapLabel.Widget_interfaceComponents[var0][var2] = new Widget(); - WorldMapLabel.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - WorldMapLabel.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - WorldMapLabel.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } + 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; } } - class197.Widget_loadedInterfaces[var0] = true; - return true; - } - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "-1282364496" - ) - @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 = class288.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; + 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; } - - var6 = var7; } - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "(Lbx;II)V", - garbageValue = "1584696624" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field985 >= Client.cycle) { - class185.method3685(var0); - } else if (var0.field986 >= Client.cycle) { - GrandExchangeEvent.method88(var0); - } else { - WorldMapRegion.method565(var0); - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field985 = 0; - var0.field986 = 0; - var0.x = var0.pathX[0] * 128 + var0.field942 * 2013925376; - var0.y = var0.pathY[0] * 128 + var0.field942 * 2013925376; - var0.method1740(); - } - - if (class192.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field985 = 0; - var0.field986 = 0; - var0.x = var0.pathX[0] * 128 + var0.field942 * 2013925376; - var0.y = var0.pathY[0] * 128 + var0.field942 * 2013925376; - var0.method1740(); - } - - int var5; - if (var0.field975 != 0) { - if (var0.targetIndex != -1) { - Object var2 = null; - if (var0.targetIndex < 32768) { - var2 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var2 = Client.players[var0.targetIndex - 32768]; - } - - if (var2 != null) { - int var6 = var0.x - ((Actor)var2).x; - int var4 = var0.y - ((Actor)var2).y; - if (var6 != 0 || var4 != 0) { - var0.orientation = (int)(Math.atan2((double)var6, (double)var4) * 325.949D) & 2047; + 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; } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; } } + } - if (var0.field967 != -1 && (var0.pathLength == 0 || var0.field997 > 0)) { - var0.orientation = var0.field967; - var0.field967 = -1; - } + 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; + } - var5 = var0.orientation - var0.rotation & 2047; - if (var5 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var5 != 0) { - ++var0.field956; - boolean var8; - if (var5 > 1024) { - var0.rotation -= var0.field975; - var8 = true; - if (var5 < var0.field975 || var5 > 2048 - var0.field975) { - var0.rotation = var0.orientation; - var8 = false; - } - - if (var0.movementSequence == var0.readySequence && (var0.field956 > 25 || var8)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } + 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 { - var0.rotation += var0.field975; - var8 = true; - if (var5 < var0.field975 || var5 > 2048 - var0.field975) { - var0.rotation = var0.orientation; - var8 = false; - } - - if (var0.movementSequence == var0.readySequence && (var0.field956 > 25 || var8)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } + var23[var19 + 1536] = var12; + var23[var19 + 1 + 1024] = var12; + var23[var19 + 512 + 2] = var12; + var23[var19 + 3] = var12; } - - var0.rotation &= 2047; - } else { - var0.field956 = 0; } } - var0.isWalking = false; - SequenceDefinition var7; - if (var0.movementSequence != -1) { - var7 = GraphicsDefaults.SequenceDefinition_get(var0.movementSequence); - if (var7 != null && var7.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var7.frameIds.length && var0.movementFrameCycle > var7.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - GameObject.addSequenceSoundEffect(var7, var0.movementFrame, var0.x, var0.y); + 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); } - - if (var0.movementFrame >= var7.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - GameObject.addSequenceSoundEffect(var7, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; } } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field979) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - var5 = class65.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var5 != -1) { - SequenceDefinition var3 = GraphicsDefaults.SequenceDefinition_get(var5); - if (var3 != null && var3.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - GameObject.addSequenceSoundEffect(var3, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var7 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); - if (var7.field3523 == 1 && var0.field998 > 0 && var0.field985 <= Client.cycle && var0.field986 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var7 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); - if (var7 != null && var7.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var7.frameIds.length && var0.sequenceFrameCycle > var7.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - GameObject.addSequenceSoundEffect(var7, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var7.frameIds.length) { - var0.sequenceFrame -= var7.frameCount; - ++var0.field983; - if (var0.field983 >= var7.field3522) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var7.frameIds.length) { - GameObject.addSequenceSoundEffect(var7, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var7.field3518; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } - @ObfuscatedName("jj") + @ObfuscatedName("hb") @ObfuscatedSignature( - signature = "(Lhn;B)Z", - garbageValue = "-53" + signature = "(I)V", + garbageValue = "1005499202" ) - @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 = GrandExchangeOfferTotalQuantityComparator.method106(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; - } + 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; } - return true; } } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 2d38ab8f85..6b418837a8 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,46 +1,230 @@ +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("bi") +@ObfuscatedName("bx") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("ey") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("fd") - @ObfuscatedGetter( - intValue = 696755763 - ) - static int field530; - @ObfuscatedName("gq") - @ObfuscatedGetter( - intValue = 1829192953 - ) - static int field531; - @ObfuscatedName("gd") - @ObfuscatedSignature( - signature = "[Llt;" - ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; - @ObfuscatedName("kk") - @ObfuscatedGetter( - intValue = -821699027 - ) - @Export("menuY") - static int menuY; - SecureRandomCallable() { } public Object call() { - return class51.method896(); + SecureRandom var2 = new SecureRandom(); + var2.nextInt(); + return var2; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1446972814" + ) + 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(); + } 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); + } + + 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); + } + + 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.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(Lel;IIII)Z", + garbageValue = "1749928116" + ) + 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; + } + } + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + signature = "([Lhe;IB)V", + garbageValue = "112" + ) + @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); + } + } + } + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 6e76ae5cb8..08798c7376 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -1,4 +1,3 @@ -import java.lang.management.GarbageCollectorMXBean; import java.security.SecureRandom; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -7,18 +6,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cm") +@ObfuscatedName("ca") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("an") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("c") + @ObfuscatedName("ol") + @ObfuscatedSignature( + signature = "Lfq;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("ds") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("x") @Export("executor") ExecutorService executor; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("future") Future future; @@ -27,10 +34,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-884286176" + signature = "(B)V", + garbageValue = "-128" ) @Export("shutdown") void shutdown() { @@ -38,182 +45,173 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1065937119" + signature = "(B)Z", + garbageValue = "-126" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "519596197" + garbageValue = "876677352" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); - } catch (Exception var2) { - return class51.method896(); + } catch (Exception var4) { + SecureRandom var3 = new SecureRandom(); + var3.nextInt(); + return var3; } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)[Lhu;", - garbageValue = "44" + signature = "(III)I", + garbageValue = "1233974315" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_normal, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman}; - } + public static int method2226(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { + var2 = var0 * var2; + } - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(ZZI)Lli;", - garbageValue = "-1201437930" - ) - static IndexedSprite method2171(boolean var0, boolean var1) { - return var0 ? (var1 ? VertexNormal.field1753 : DirectByteArrayCopier.options_buttons_2Sprite) : (var1 ? ItemContainer.field547 : WorldMapSprite.options_buttons_0Sprite); - } + var0 *= var0; + } - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1704416266" - ) - static int method2169(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.cycle; - return 1; + if (var1 == 1) { + return var0 * var2; } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.method4043(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.method340(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = Clock.Client_plane; - var4 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); - var5 = Language.baseY * 64 + (class192.localPlayer.y >> 7); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.method4043(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.method340(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } + return var2; + } + } - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(IIIIIZI)Lla;", + garbageValue = "-2006803252" + ) + @Export("getItemSprite") + public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; + } - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - class320.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - return 1; - } else { - return 2; + long var6 = ((long)var3 << 42) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40); + Sprite var8; + if (!var5) { + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } + + ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; } } + + if (var10 != -1) { + var9 = AbstractWorldMapData.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); + if (var19 == null) { + return null; + } else { + Sprite var20 = null; + if (var9.noteTemplate != -1) { + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var20 == null) { + return null; + } + } else if (var9.notedId != -1) { + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var20 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var20 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new Sprite(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3099(16, 16); + Rasterizer3D.field1772 = false; + if (var9.placeholderTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { + var16 = (int)((double)var16 * 1.04D); + } + + 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); + if (var9.notedId != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + class51.ItemDefinition_fontPlain11.draw(GrandExchangeOfferOwnWorldComparator.method1385(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field1772 = true; + return var8; } } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 992ef2f7cc..c8958bdb60 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,98 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("jc") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("no") + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = -1648433233 + intValue = -1632730769 ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("c") + static int field3526; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("i") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("g") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("o") + public static String field3527; + @ObfuscatedName("v") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 767757023 + intValue = -750244517 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("p") + @ObfuscatedName("s") int[] field3517; - @ObfuscatedName("h") + @ObfuscatedName("p") public boolean field3518; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 180698695 - ) - public int field3508; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1537834299 + intValue = 1293261891 + ) + public int field3519; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1094123699 ) @Export("shield") public int shield; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -698068841 + intValue = -17515833 ) @Export("weapon") public int weapon; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -796705451 + intValue = -1281885521 ) public int field3522; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2012869833 + intValue = 1964972701 ) - public int field3523; - @ObfuscatedName("q") + public int field3520; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1328326195 + intValue = -457337523 ) public int field3524; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 738331183 + intValue = -789911207 ) - public int field3516; + public int field3525; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -105,19 +94,19 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; this.field3518 = false; - this.field3508 = 5; + this.field3519 = 5; this.shield = -1; this.weapon = -1; this.field3522 = 99; - this.field3523 = -1; + this.field3520 = -1; this.field3524 = -1; - this.field3516 = 2; + this.field3525 = 2; } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "-76" + signature = "(Lkb;I)V", + garbageValue = "-1859351730" ) @Export("decode") void decode(Buffer var1) { @@ -131,10 +120,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-683003303" + signature = "(Lkb;II)V", + garbageValue = "-951623720" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -171,7 +160,7 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 4) { this.field3518 = true; } else if (var2 == 5) { - this.field3508 = var1.readUnsignedByte(); + this.field3519 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { @@ -179,11 +168,11 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 8) { this.field3522 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field3523 = var1.readUnsignedByte(); + this.field3520 = var1.readUnsignedByte(); } else if (var2 == 10) { this.field3524 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field3516 = var1.readUnsignedByte(); + this.field3525 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -206,18 +195,18 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "145169378" + signature = "(B)V", + garbageValue = "-18" ) @Export("postDecode") void postDecode() { - if (this.field3523 == -1) { + if (this.field3520 == -1) { if (this.field3517 != null) { - this.field3523 = 2; + this.field3520 = 2; } else { - this.field3523 = 0; + this.field3520 = 0; } } @@ -231,15 +220,15 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ldx;IB)Ldx;", - garbageValue = "4" + signature = "(Lel;II)Lel;", + garbageValue = "1747843246" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = EnumDefinition.getFrames(var2 >> 16); + Frames var3 = GrandExchangeEvents.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -250,15 +239,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ldx;III)Ldx;", - garbageValue = "2024082639" + signature = "(Lel;III)Lel;", + garbageValue = "-1535419363" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = EnumDefinition.getFrames(var2 >> 16); + Frames var4 = GrandExchangeEvents.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -286,15 +275,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ldx;II)Ldx;", - garbageValue = "-1856197357" + signature = "(Lel;IB)Lel;", + garbageValue = "66" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = EnumDefinition.getFrames(var2 >> 16); + Frames var3 = GrandExchangeEvents.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -305,21 +294,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ldx;ILip;IB)Ldx;", - garbageValue = "29" + signature = "(Lel;ILjc;IB)Lel;", + garbageValue = "1" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = EnumDefinition.getFrames(var2 >> 16); + Frames var5 = GrandExchangeEvents.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = EnumDefinition.getFrames(var4 >> 16); + Frames var6 = GrandExchangeEvents.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -334,15 +323,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ldx;II)Ldx;", - garbageValue = "221538890" + signature = "(Lel;IB)Lel;", + garbageValue = "14" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = EnumDefinition.getFrames(var3 >> 16); + Frames var4 = GrandExchangeEvents.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -351,7 +340,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = EnumDefinition.getFrames(var6 >> 16); + var5 = GrandExchangeEvents.getFrames(var6 >> 16); var6 &= 65535; } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index d82920bade..7e59e98c32 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -4,52 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("ii") @Implements("ServerBuild") public class ServerBuild { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lii;" ) @Export("LIVE") static final ServerBuild LIVE; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lii;" ) @Export("BUILDLIVE") static final ServerBuild BUILDLIVE; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lii;" ) @Export("RC") static final ServerBuild RC; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lii;" ) @Export("WIP") static final ServerBuild WIP; - @ObfuscatedName("dc") - @ObfuscatedGetter( - longValue = 1863736648599346965L - ) - static long field3111; - @ObfuscatedName("gl") - @ObfuscatedSignature( - signature = "Lem;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("name") public final String name; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1460040921 + intValue = 1808149537 ) - final int field3108; + final int field3101; static { LIVE = new ServerBuild("LIVE", 0); @@ -60,29 +49,6 @@ public class ServerBuild { ServerBuild(String var1, int var2) { this.name = var1; - this.field3108 = var2; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(BI)C", - garbageValue = "798764142" - ) - public static char method4209(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class288.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; - } - - return (char)var1; - } + this.field3101 = var2; } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index e2356246a0..a1bd73990a 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,539 +4,545 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gv") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2127; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2118; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2119; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2120; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2121; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2122; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2123; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2124; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2126; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2145; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2200; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgb;" + 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 = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2132; + public static final ServerPacket field2124; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2117; - @ObfuscatedName("y") + public static final ServerPacket field2169; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2134; - @ObfuscatedName("f") + public static final ServerPacket field2126; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2135; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2136; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2137; + public static final ServerPacket field2127; @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2138; - @ObfuscatedName("a") + public static final ServerPacket field2197; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2139; + public static final ServerPacket field2186; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ServerPacket field2128; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgb;" + 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("ae") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2141; - @ObfuscatedName("af") + public static final ServerPacket field2118; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2142; - @ObfuscatedName("az") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2181; - @ObfuscatedName("ax") + public static final ServerPacket field2143; + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "Lgb;" + 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("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2173; + 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 = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2146; - @ObfuscatedName("ay") + public static final ServerPacket field2155; + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgb;" + 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 = "Lgb;" - ) - public static final ServerPacket field2183; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2152; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2125; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2116; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2144; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2115; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2160; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2161; - @ObfuscatedName("ag") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2149; - @ObfuscatedName("ai") + public static final ServerPacket field2192; + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2163; - @ObfuscatedName("ab") + public static final ServerPacket field2168; + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2164; - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2133; - @ObfuscatedName("ah") + public static final ServerPacket field2165; + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2166; - @ObfuscatedName("bq") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2128; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2193; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2167; - @ObfuscatedName("bl") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2174; - @ObfuscatedName("by") + public static final ServerPacket field2203; + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lgb;" + 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 = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2176; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2179; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2184; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2187; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2186; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2188; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2189; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2190; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2191; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2192; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) public static final ServerPacket field2194; - @ObfuscatedName("cr") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2195; - @ObfuscatedName("co") + public static final ServerPacket field2146; + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2196; - @ObfuscatedName("ck") + public static final ServerPacket field2152; + @ObfuscatedName("br") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2197; - @ObfuscatedName("cn") + public static final ServerPacket field2180; + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2198; - @ObfuscatedName("cd") + public static final ServerPacket field2181; + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgv;" ) - public static final ServerPacket field2199; - @ObfuscatedName("ct") + public static final ServerPacket field2182; + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lgb;" + 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("cb") + @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;" + ) + public static final ServerPacket field2191; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ServerPacket field2189; + @ObfuscatedName("bi") + @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;" + ) + public static final ServerPacket field2200; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ServerPacket field2201; + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ServerPacket field2202; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = -253091969 + intValue = 1823465111 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("cs") + @ObfuscatedGetter( + intValue = -1540694469 ) @Export("id") public final int id; - @ObfuscatedName("cf") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -2142753579 + intValue = -1233445787 ) @Export("length") public final int length; static { - field2127 = new ServerPacket(0, 6); - field2129 = new ServerPacket(1, 2); - field2168 = new ServerPacket(2, 1); - field2118 = new ServerPacket(3, 0); - field2119 = new ServerPacket(4, 2); - field2120 = new ServerPacket(5, 2); - field2121 = new ServerPacket(6, 12); - field2122 = new ServerPacket(7, -1); - field2123 = new ServerPacket(8, 6); - field2124 = new ServerPacket(9, -2); - field2159 = new ServerPacket(10, 4); - field2126 = new ServerPacket(11, -2); - field2165 = new ServerPacket(12, 10); - field2145 = new ServerPacket(13, 2); - field2200 = new ServerPacket(14, -2); - field2169 = new ServerPacket(15, -2); - field2131 = new ServerPacket(16, -2); - field2132 = new ServerPacket(17, -2); - field2117 = new ServerPacket(18, -1); - field2134 = new ServerPacket(19, 1); - field2135 = new ServerPacket(20, -1); - field2136 = new ServerPacket(21, 28); - field2137 = new ServerPacket(22, 0); - field2138 = new ServerPacket(23, 2); - field2139 = new ServerPacket(24, -1); - field2140 = new ServerPacket(25, -2); - field2141 = new ServerPacket(26, 8); - field2142 = new ServerPacket(27, -1); - field2181 = new ServerPacket(28, 0); - field2151 = new ServerPacket(29, -2); - field2173 = new ServerPacket(30, 5); - field2146 = new ServerPacket(31, -2); - field2178 = new ServerPacket(32, 2); - field2183 = new ServerPacket(33, 2); - field2172 = new ServerPacket(34, 3); - field2150 = new ServerPacket(35, -2); - field2148 = new ServerPacket(36, -2); - field2152 = new ServerPacket(37, 1); - field2153 = new ServerPacket(38, 3); - field2125 = new ServerPacket(39, 6); - field2143 = new ServerPacket(40, 7); - field2116 = new ServerPacket(41, -2); - field2157 = new ServerPacket(42, -2); - field2144 = new ServerPacket(43, 5); - field2115 = new ServerPacket(44, -2); - field2160 = new ServerPacket(45, 1); - field2161 = new ServerPacket(46, 4); - field2149 = new ServerPacket(47, -2); - field2163 = new ServerPacket(48, 1); - field2164 = new ServerPacket(49, 15); - field2133 = new ServerPacket(50, 8); - field2166 = new ServerPacket(51, 4); - field2128 = new ServerPacket(52, 6); - field2156 = new ServerPacket(53, 8); - field2162 = new ServerPacket(54, 4); - field2155 = new ServerPacket(55, -1); - field2171 = new ServerPacket(56, 4); - field2193 = new ServerPacket(57, 0); - field2167 = new ServerPacket(58, -2); - field2174 = new ServerPacket(59, 8); - field2175 = new ServerPacket(60, 4); - field2176 = new ServerPacket(61, 2); - field2177 = new ServerPacket(62, -2); - field2154 = new ServerPacket(63, 6); - field2179 = new ServerPacket(64, 6); - field2180 = new ServerPacket(65, 20); - field2158 = new ServerPacket(66, 6); - field2182 = new ServerPacket(67, -2); - field2130 = new ServerPacket(68, 6); - field2184 = new ServerPacket(69, 6); - field2187 = new ServerPacket(70, 14); - field2186 = new ServerPacket(71, 2); - field2147 = new ServerPacket(72, 7); - field2188 = new ServerPacket(73, 4); - field2189 = new ServerPacket(74, 2); - field2190 = new ServerPacket(75, 1); - field2191 = new ServerPacket(76, 6); - field2192 = new ServerPacket(77, 0); - field2170 = new ServerPacket(78, 0); - field2194 = new ServerPacket(79, 10); - field2195 = new ServerPacket(80, 5); - field2196 = new ServerPacket(81, 0); - field2197 = new ServerPacket(82, 5); - field2198 = new ServerPacket(83, 5); - field2199 = new ServerPacket(84, 6); - field2185 = new ServerPacket(85, -2); + 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); } ServerPacket(int var1, int var2) { @@ -544,280 +550,12 @@ public class ServerPacket { this.length = var2; } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)[B", - garbageValue = "-64964867" + signature = "(II)V", + garbageValue = "-1077570862" ) - public static byte[] method3680(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)) { - 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; - } - } else { - var2[var3] = (byte)var4; - } - } - - return var2; - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "-1920568939" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (ScriptFrame.loadInterface(var0)) { - Entity.field1866 = null; - FloorOverlayDefinition.drawInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (Entity.field1866 != null) { - FloorOverlayDefinition.drawInterface(Entity.field1866, -1412584499, var1, var2, var3, var4, WorldMapIcon_0.field142, UserComparator9.field1965, var7); - Entity.field1866 = null; - } - - } else { - if (var7 != -1) { - Client.field851[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field851[var8] = true; - } - } - - } - } - - @ObfuscatedName("ju") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "104" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - BufferedSource.method5934(); - class188.method3708(); - int var1 = Messages.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); - } - - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } - - if (var1 == 3) { - short var3 = 0; - if (var2 == 0) { - var3 = 255; - } - - if (var2 == 1) { - var3 = 192; - } - - if (var2 == 2) { - var3 = 128; - } - - if (var2 == 3) { - var3 = 64; - } - - if (var2 == 4) { - var3 = 0; - } - - if (var3 != Client.musicVolume) { - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - Archive var4 = MouseHandler.archive6; - int var5 = Client.currentTrackGroupId; - class197.field2414 = 1; - UserComparator5.musicTrackArchive = var4; - class197.musicTrackGroupId = var5; - class83.musicTrackFileId = 0; - AttackOption.musicTrackVolume = var3; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 10000; - Client.field881 = false; - } else if (var3 == 0) { - class197.midiPcmStream.clear(); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; - Client.field881 = false; - } else if (class197.field2414 != 0) { - AttackOption.musicTrackVolume = var3; - } else { - class197.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.field811 = 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[] var6; - if (var1 == 18) { - var6 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.playerAttackOption = (AttackOption)WorldMapSection0.findEnumerated(var6, 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) { - var6 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.npcAttackOption = (AttackOption)WorldMapSection0.findEnumerated(var6, var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } + 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 e6e2e72bd4..17e658f8fe 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,40 +1,28 @@ -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("ec") +@ObfuscatedName("eb") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("hx") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1721561941 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("jv") - @ObfuscatedSignature( - signature = "Lhn;" - ) - static Widget field1793; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1632248683 + intValue = -1117986987 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 705396631 + intValue = 1228230163 ) @Export("count") int count; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("labels") int[][] labels; @@ -62,28 +50,46 @@ public class Skeleton extends Node { } - @ObfuscatedName("g") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "483242164" + signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "172468289" ) - public static void method3152() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + ChatChannel.addChatMessage(var0, var1, var2, (String)null); } - @ObfuscatedName("p") + @ObfuscatedName("hw") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "91" + signature = "(IIIIIIIIII)V", + garbageValue = "-903187990" ) - static String method3153() { - String var0 = ""; + @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; - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { - var2 = (Message)var1.next(); + 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; + } } - return var0; + 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 069e7b0263..d3a9a981dd 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("hm") +@ObfuscatedName("ho") @Implements("Skills") public class Skills { - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,52 +27,27 @@ public class Skills { } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "88" + signature = "(I)[Lle;", + garbageValue = "1897656979" ) - @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; - } - } + public static IndexedSprite[] method4214() { + IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; - @ObfuscatedName("hw") - @ObfuscatedSignature( - signature = "(IIIIIIIIII)V", - garbageValue = "730200228" - ) - @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; - } + 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]; } - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - WorldMapDecoration.method347(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field933 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; + Ignored.method5235(); + return var0; } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 4c7896d292..ab5c3e9a00 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("ej") +@ObfuscatedName("fy") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @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 379db3ef19..54ef71f04b 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,36 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("dk") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("c") + @ObfuscatedName("z") + static byte[][][] field1462; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llv;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Lii;Lii;)V" + signature = "(Liy;Liy;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -41,10 +43,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II[II)Lcv;", - garbageValue = "-2049722880" + signature = "(II[II)Ldm;", + garbageValue = "-1082666612" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -72,10 +74,10 @@ public class SoundCache { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II[II)Lcv;", - garbageValue = "-207683218" + signature = "(II[II)Ldm;", + garbageValue = "-1027789078" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -109,10 +111,10 @@ public class SoundCache { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I[II)Lcv;", - garbageValue = "-1171903623" + signature = "(I[II)Ldm;", + garbageValue = "-1326319727" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -125,10 +127,10 @@ public class SoundCache { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I[II)Lcv;", - garbageValue = "872034645" + signature = "(I[II)Ldm;", + garbageValue = "211592248" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -140,4 +142,866 @@ public class SoundCache { throw new RuntimeException(); } } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "277907731" + ) + @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; + } + + 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") + @ObfuscatedSignature( + signature = "(Lbi;IIBI)V", + garbageValue = "1090203781" + ) + 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; + + 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; + } + } + + 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); + } + + } + } + } + } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 1b3f2a1355..f79156f479 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("cs") +@ObfuscatedName("dj") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("t") - @Export("start") - int start; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Ldq;" + signature = "[Ldp;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("e") + @ObfuscatedName("k") + @Export("start") + int start; + @ObfuscatedName("d") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Lcv;" + signature = "()Ldm;" ) @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("o") + @ObfuscatedName("k") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;II)Lcs;" + signature = "(Liy;II)Ldj;" ) @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 1bafcb04aa..a1e736cc96 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,37 +3,37 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("de") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("c") + @ObfuscatedName("m") @Export("segments") int segments; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("durations") int[] durations; - @ObfuscatedName("o") + @ObfuscatedName("d") @Export("phases") int[] phases; - @ObfuscatedName("e") + @ObfuscatedName("w") @Export("start") int start; - @ObfuscatedName("i") + @ObfuscatedName("v") @Export("end") int end; - @ObfuscatedName("g") + @ObfuscatedName("q") @Export("form") int form; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("ticks") int ticks; - @ObfuscatedName("l") + @ObfuscatedName("t") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("j") + @ObfuscatedName("e") @Export("step") int step; - @ObfuscatedName("m") + @ObfuscatedName("s") @Export("amplitude") int amplitude; @ObfuscatedName("p") @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("e") + @ObfuscatedName("d") @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 0cd653bdf4..96eba3038c 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,12 +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("dl") +@ObfuscatedName("dh") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = -1992828169 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("x") @ObfuscatedSignature( signature = "[Ldw;" ) @@ -26,76 +39,8 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - class225.RunException_sendStackTrace((String)null, var4); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var4); } } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;Lii;Lii;Lii;I)V", - garbageValue = "-1591363880" - ) - public static void method2562(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - class197.Widget_archive = var0; - Calendar.Widget_modelsArchive = var1; - Username.Widget_spritesArchive = var2; - class162.Widget_fontsArchive = var3; - WorldMapLabel.Widget_interfaceComponents = new Widget[class197.Widget_archive.getGroupCount()][]; - class197.Widget_loadedInterfaces = new boolean[class197.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-660130030" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field408 == KeyHandler.field406) { - return false; - } else { - RouteStrategy.field2102 = KeyHandler.field403[KeyHandler.field406]; - class51.field432 = KeyHandler.field410[KeyHandler.field406]; - KeyHandler.field406 = KeyHandler.field406 + 1 & 127; - return true; - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1995069725" - ) - static void method2563() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "(Lir;I)Z", - garbageValue = "-676934548" - ) - static boolean method2565(ObjectDefinition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; - - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectDefinition var4 = Occluder.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; - } - } - } else if (var0.mapIconId != -1) { - return true; - } - - return false; - } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index f1b78f8ada..62f6979ff5 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,89 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("iw") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 3022449387448969611L - ) - static long field3250; - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Liy;" + ) + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Leg;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("i") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -156986683 + intValue = -1568663321 ) @Export("id") int id; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1502425333 + intValue = -2124513073 ) @Export("archive") int archive; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1520405285 + intValue = 872877257 ) @Export("sequence") public int sequence; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1086459563 + intValue = -1719223697 ) @Export("widthScale") int widthScale; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 499917181 + intValue = -1056397705 ) @Export("heightScale") int heightScale; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 137606467 + intValue = 378362489 ) @Export("orientation") int orientation; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1988422047 + intValue = -811477227 ) @Export("ambient") int ambient; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 31690663 + intValue = 551721489 ) @Export("contrast") int contrast; @@ -105,10 +106,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "-90" + signature = "(Lkb;B)V", + garbageValue = "-55" ) @Export("decode") void decode(Buffer var1) { @@ -122,9 +123,9 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IB)V", + signature = "(Lkb;IB)V", garbageValue = "0" ) @Export("decodeNext") @@ -169,16 +170,16 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Ldx;", - garbageValue = "-1614989668" + signature = "(II)Lel;", + garbageValue = "-1314564797" ) @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(ArchiveDiskActionHandler.SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -202,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = GraphicsDefaults.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -231,24 +232,25 @@ public class SpotAnimationDefinition extends DualNode { return var5; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lid;", - garbageValue = "-1522050004" + signature = "(II)Ljc;", + garbageValue = "1802255553" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); + byte[] var2 = Varcs.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); + 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 5e82bf8a06..17124a7129 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("lt") +@ObfuscatedName("la") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("pixels") public int[] pixels; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("subWidth") public int subWidth; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("subHeight") public int subHeight; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("xOffset") public int xOffset; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("yOffset") int yOffset; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("width") public int width; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class Sprite extends Rasterizer2D { Sprite() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Llt;" + signature = "()Lla;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Llt;" + signature = "()Lla;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,13 +81,13 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("e") + @ObfuscatedName("d") @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("i") + @ObfuscatedName("w") @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("g") + @ObfuscatedName("v") @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("d") + @ObfuscatedName("q") @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("l") + @ObfuscatedName("z") @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("j") + @ObfuscatedName("t") @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("m") + @ObfuscatedName("e") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -270,7 +270,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @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("w") + @ObfuscatedName("g") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -431,7 +431,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("a") @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("f") + @ObfuscatedName("c") @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("u") - public void method6201(int var1, int var2, int var3) { + @ObfuscatedName("ae") + public void method6234(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) { - method6197(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6235(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6203(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6236(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("az") - public void method6280(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ap") + public void method6268(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) { - method6255(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6238(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6221(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6239(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("au") - public void method6207(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("af") + public void method6240(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("ay") + @ObfuscatedName("at") @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,7 +744,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aa") + @ObfuscatedName("as") public void method6242(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; @@ -783,13 +783,13 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aq") - public void method6210(int var1, int var2, int var3, int var4) { - this.method6211(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @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("as") - void method6211(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("au") + void method6266(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("ak") + @ObfuscatedName("ao") @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("p") + @ObfuscatedName("s") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1400,7 +1400,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("v") + @ObfuscatedName("n") @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("x") + @ObfuscatedName("h") @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("q") + @ObfuscatedName("i") @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("y") + @ObfuscatedName("o") @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("a") + @ObfuscatedName("f") @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("ae") - static void method6197(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("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) { 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("af") - static void method6203(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("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) { 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("ax") - static void method6255(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("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) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1628,8 +1628,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aj") - static void method6221(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("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) { 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 1662659bc9..437424925e 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("hf") +@ObfuscatedName("hg") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1040001761 + intValue = -1355900291 ) @Export("width") public final int width; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1175946867 + intValue = 1444758519 ) @Export("height") public final int height; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("xStarts") public final int[] xStarts; @@ -33,10 +33,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "2110686779" + garbageValue = "-822552656" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -50,99 +50,24 @@ public class SpriteMask extends DualNode { return false; } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIB)Lhn;", - garbageValue = "-27" + signature = "(IS)Liu;", + garbageValue = "14194" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = Varps.getWidget(var0); - if (var1 == -1) { - return var2; + public static VarbitDefinition method4061(int var0) { + VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "398303875" - ) - public static int method4038() { - return ++MouseHandler.MouseHandler_idleCycles - 1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-1864431963" - ) - @Export("SpriteBuffer_decode") - public static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class326.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - Huffman.SpriteBuffer_xOffsets = new int[class326.SpriteBuffer_spriteCount]; - NPC.SpriteBuffer_yOffsets = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_spriteWidths = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_spriteHeights = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_pixels = new byte[class326.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8; - GZipDecompressor.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class326.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - Huffman.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - NPC.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - class326.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - class326.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class326.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class326.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class326.SpriteBuffer_spritePalette[var3] == 0) { - class326.SpriteBuffer_spritePalette[var3] = 1; + 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; } - - var1.offset = 0; - - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - int var4 = class326.SpriteBuffer_spriteWidths[var3]; - int var5 = class326.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - class326.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(); - } - } - } - } - } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 2be38cfcd5..e83563f8df 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,96 +1,70 @@ -import 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("hk") +@ObfuscatedName("hx") @Implements("Strings") public class Strings { - @ObfuscatedName("bk") - public static String field3045; - @ObfuscatedName("cq") - public static String field2808; - @ObfuscatedName("ji") - public static String field3036; - @ObfuscatedName("jc") - public static String field3037; - @ObfuscatedName("jn") - public static String field2933; + @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; static { - field3045 = "Please visit the support page for assistance."; - field2808 = "Please visit the support page for assistance."; - field3036 = ""; - field3037 = "Page has opened in a new window."; - field2933 = "(Please check your popup blocker.)"; + 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("jt") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhn;III)V", - garbageValue = "-1274264316" + signature = "(IS)Lii;", + garbageValue = "18624" ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var5 = var0; - int var7 = WorldMapIcon_0.getWidgetClickMask(var0); - int var6 = var7 >> 17 & 7; - int var8 = var6; - Widget var4; - if (var6 == 0) { - var4 = null; - } else { - int var9 = 0; + public static ServerBuild method4219(int var0) { + ServerBuild[] var1 = Language.method3751(); - while (true) { - if (var9 >= var8) { - var4 = var5; - break; - } + for (int var2 = 0; var2 < var1.length; ++var2) { + ServerBuild var3 = var1[var2]; + if (var0 == var3.field3101) { + return var3; + } + } - var5 = Varps.getWidget(var5.parentId); - if (var5 == null) { - var4 = null; - break; - } + return null; + } - ++var9; - } - } - - Widget var10 = var4; - if (var4 == null) { - var10 = var0.parent; - } - - if (var10 != null) { - Client.clickedWidget = var0; - var4 = ItemContainer.method1184(var0); - if (var4 == null) { - var4 = var0.parent; - } - - Client.clickedWidgetParent = var4; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - SequenceDefinition.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var11 = Client.menuOptionsCount - 1; - if (var11 != -1) { - WorldMapRegion.tempMenuAction = new MenuAction(); - WorldMapRegion.tempMenuAction.param0 = Client.menuArguments1[var11]; - WorldMapRegion.tempMenuAction.param1 = Client.menuArguments2[var11]; - WorldMapRegion.tempMenuAction.opcode = Client.menuOpcodes[var11]; - WorldMapRegion.tempMenuAction.identifier = Client.menuIdentifiers[var11]; - WorldMapRegion.tempMenuAction.action = Client.menuActions[var11]; - } - - return; - } + @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; } } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index f6a03a8fcc..b6d993b2e6 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -2,34 +2,40 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("it") +@ObfuscatedName("jq") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("be") - static String field3307; - @ObfuscatedName("gk") + @ObfuscatedName("w") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("p") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "[Llt;" + signature = "Lle;" ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("o") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("gc") + @Export("regions") + static int[] regions; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Llp;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -41,19 +47,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2114792019" + garbageValue = "1990105365" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-215711258" + signature = "(Lkb;B)V", + garbageValue = "-61" ) @Export("decode") void decode(Buffer var1) { @@ -67,182 +73,58 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkp;IS)V", - garbageValue = "-16433" + signature = "(Lkb;II)V", + garbageValue = "675280031" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = MouseRecorder.readStringIntParameters(var1, this.params); + this.params = NetCache.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-1540042604" + garbageValue = "1605132881" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class185.method3686(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-32852937" + garbageValue = "-1577444936" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorDecoration.method2914(this.params, var1, var2); + return class9.method122(this.params, var1, var2); } - @ObfuscatedName("aj") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "2113754677" + signature = "(CS)C", + garbageValue = "255" ) - static int method4627(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - class320.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - long var5 = WorldMapIcon_0.currentTimeMillis() - class30.field274 - 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[++Message.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } - } - } + static char method4589(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 4bc1864044..f7fe8a4565 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,52 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("iv") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lhx;" + signature = "Liv;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("name") public final String name; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 905607023 + intValue = 2013565785 ) @Export("id") final int id; @@ -59,13 +59,690 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([BB)Ljava/lang/String;", + garbageValue = "-100" + ) + 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("=="); + } + } + + String var1 = var3.toString(); + return var1; + } + + @ObfuscatedName("fh") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "719259365" + ) + @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); + } + } + } + } + } + } + } + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index fe749efe44..39f88ba5f8 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("fw") +@ObfuscatedName("fr") @Implements("Task") public class Task { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfr;" ) @Export("next") Task next; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("status") public volatile int status; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1842661257 + intValue = -2125226355 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("intArgument") public int intArgument; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("j") + @ObfuscatedName("t") @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 ddae6f4386..31378aaae6 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,28 +7,37 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fs") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("o") + @ObfuscatedName("m") + @Export("javaVersion") + public static String javaVersion; + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lkx;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lfr;" ) @Export("current") Task current; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfr;" ) @Export("task") Task task; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("thread") Thread thread; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("isClosed") boolean isClosed; @@ -37,11 +46,11 @@ public class TaskHandler implements Runnable { this.task = null; this.isClosed = false; javaVendor = "Unknown"; - class216.javaVersion = "1.6"; + javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); - class216.javaVersion = System.getProperty("java.version"); + javaVersion = System.getProperty("java.version"); } catch (Exception var2) { } @@ -52,10 +61,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-77" + garbageValue = "-64" ) @Export("close") public final void close() { @@ -71,10 +80,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;S)Lfw;", - garbageValue = "-10894" + signature = "(IIILjava/lang/Object;I)Lfr;", + garbageValue = "-957641141" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -95,20 +104,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Lfw;", - garbageValue = "-260343907" + signature = "(Ljava/lang/String;IB)Lfr;", + garbageValue = "-83" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;II)Lfw;", - garbageValue = "70274663" + signature = "(Ljava/lang/Runnable;IB)Lfr;", + garbageValue = "-108" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -163,37 +172,74 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lmv;I)I", - garbageValue = "1649958240" + signature = "(CB)B", + garbageValue = "108" ) - public static final int method3540(LoginType var0) { - if (var0 == null) { - return 12; + @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 { - switch(var0.field4037) { - case 6: - return 20; - default: - return 12; - } + var1 = 63; } - } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(ILii;IIIZI)V", - garbageValue = "869410445" - ) - @Export("playMusicTrack") - public static void playMusicTrack(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class197.field2414 = 1; - UserComparator5.musicTrackArchive = var1; - class197.musicTrackGroupId = var2; - class83.musicTrackFileId = var3; - AttackOption.musicTrackVolume = var4; - KeyHandler.musicTrackBoolean = var5; - class197.field2412 = var0; + return var1; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 86681ec149..ddc39a4746 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("db") +@ObfuscatedName("et") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("averageRGB") int averageRGB; - @ObfuscatedName("g") - boolean field1610; - @ObfuscatedName("d") + @ObfuscatedName("v") + boolean field1638; + @ObfuscatedName("q") @Export("fileIds") int[] fileIds; - @ObfuscatedName("l") - int[] field1612; - @ObfuscatedName("j") - int[] field1607; - @ObfuscatedName("m") - int[] field1613; - @ObfuscatedName("p") + @ObfuscatedName("z") + int[] field1640; + @ObfuscatedName("t") + int[] field1633; + @ObfuscatedName("e") + int[] field1634; + @ObfuscatedName("s") @Export("animationDirection") int animationDirection; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("pixels") int[] pixels; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkp;)V" + signature = "(Lkb;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1610 = var1.readUnsignedByte() == 1; + this.field1638 = 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.field1612 = new int[var2 - 1]; + this.field1640 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1612[var3] = var1.readUnsignedByte(); + this.field1640[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1607 = new int[var2 - 1]; + this.field1633 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1607[var3] = var1.readUnsignedByte(); + this.field1633[var3] = var1.readUnsignedByte(); } } - this.field1613 = new int[var2]; + this.field1634 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1613[var3] = var1.readInt(); + this.field1634[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(DILii;)Z" + signature = "(DILiy;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,71 +99,55 @@ public class Texture extends Node { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - int var8 = this.fileIds[var6]; - byte[] var10 = var4.takeFileFlat(var8); - boolean var9; - if (var10 == null) { - var9 = false; - } else { - SpriteMask.SpriteBuffer_decode(var10); - var9 = true; - } - - IndexedSprite var7; - if (!var9) { - var7 = null; - } else { - var7 = class313.method5962(); - } - + IndexedSprite var7 = class322.method5972(var4, this.fileIds[var6]); var7.normalize(); - var10 = var7.pixels; - int[] var11 = var7.palette; - int var12 = this.field1613[var6]; - if ((var12 & -16777216) == 16777216) { + byte[] var8 = var7.pixels; + int[] var9 = var7.palette; + int var10 = this.field1634[var6]; + if ((var10 & -16777216) == 16777216) { } - if ((var12 & -16777216) == 33554432) { + if ((var10 & -16777216) == 33554432) { } + int var11; + int var12; int var13; int var14; - int var15; - int var16; - if ((var12 & -16777216) == 50331648) { - var13 = var12 & 16711935; - var14 = var12 >> 8 & 255; + if ((var10 & -16777216) == 50331648) { + var11 = var10 & 16711935; + var12 = var10 >> 8 & 255; - 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 (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 (var13 = 0; var13 < var11.length; ++var13) { - var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); + for (var11 = 0; var11 < var9.length; ++var11) { + var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } if (var6 == 0) { - var13 = 0; + var11 = 0; } else { - var13 = this.field1612[var6 - 1]; + var11 = this.field1640[var6 - 1]; } - if (var13 == 0) { + if (var11 == 0) { if (var3 == var7.subWidth) { - for (var14 = 0; var14 < var5; ++var14) { - this.pixels[var14] = var11[var10[var14] & 255]; + for (var12 = 0; var12 < var5; ++var12) { + this.pixels[var12] = var9[var8[var12] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { - var14 = 0; + var12 = 0; - for (var15 = 0; var15 < var3; ++var15) { - for (var16 = 0; var16 < var3; ++var16) { - this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { + this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { @@ -171,36 +155,36 @@ public class Texture extends Node { throw new RuntimeException(); } - var14 = 0; + var12 = 0; - for (var15 = 0; var15 < var3; ++var15) { - for (var16 = 0; var16 < var3; ++var16) { - this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { + this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var13 == 1) { + if (var11 == 1) { } - if (var13 == 2) { + if (var11 == 2) { } - if (var13 == 3) { + if (var11 == 3) { } } return true; } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("o") + @ObfuscatedName("k") @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 e0b20248f5..43ef95f519 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("ep") +@ObfuscatedName("eu") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1435702999" + garbageValue = "-1464136827" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "16615935" + signature = "(IS)I", + garbageValue = "-26354" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "1" - ) - boolean vmethod3347(int var1); - - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2100936507" + garbageValue = "19136776" + ) + boolean vmethod3388(int var1); + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "649013843" ) @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 f0ec3a940b..0e70bf808a 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,60 +1,65 @@ -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("dr") +@ObfuscatedName("di") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("l") + @ObfuscatedName("rl") @ObfuscatedGetter( - intValue = 1177508509 + intValue = -726366613 ) - static int field1512; - @ObfuscatedName("c") + static int field1549; + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = 33349477 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Ldb;" + signature = "[Let;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljh;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -113844159 + intValue = -1467645999 ) @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -541291029 + intValue = 2063974961 ) @Export("remaining") int remaining; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("brightness") double brightness; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1626058997 + intValue = 499295403 ) @Export("textureSize") int textureSize; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Lii;Lii;IDI)V" + signature = "(Liy;Liy;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -77,10 +82,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2116644963" + garbageValue = "-1161894618" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -96,7 +101,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4224(var8)) { + if (this.archive.method4251(var8)) { ++var2; } } @@ -110,17 +115,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1435702999" + garbageValue = "-1464136827" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -150,39 +155,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "16615935" + signature = "(IS)I", + garbageValue = "-26354" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "1" - ) - public boolean vmethod3347(int var1) { - return this.textures[var1].field1610; - } - - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2100936507" + garbageValue = "19136776" + ) + public boolean vmethod3388(int var1) { + return this.textures[var1].field1638; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "649013843" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-304646242" + garbageValue = "1982258351" ) @Export("clear") public void clear() { @@ -196,10 +201,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1864865553" + garbageValue = "2066840456" ) @Export("animate") public void animate(int var1) { @@ -212,125 +217,4 @@ public class TextureProvider implements TextureLoader { } } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(CB)B", - garbageValue = "-59" - ) - @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("t") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1809197817" - ) - public static void method2833(boolean var0) { - if (NetCache.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(var0 ? 2 : 3); - var1.writeMedium(0); - NetCache.NetCache_socket.write(var1.array, 0, 4); - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var3) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(IIIIIIII)Z", - garbageValue = "1939701363" - ) - static final boolean method2811(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; - if (var7 < var0 && var7 < var1 && var7 < var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; - if (var7 < var3 && var7 < var4 && var7 < var5) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; - return var7 <= var3 || var7 <= var4 || var7 <= var5; - } - } - } - } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index b7f1c8026b..6738249166 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,135 +1,132 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("eq") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -477020471 - ) - @Export("plane") - int plane; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1716517237 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1137721201 + intValue = 1748623045 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2077595523 + intValue = 1599333141 + ) + @Export("plane") + int plane; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 109834917 + ) + @Export("x") + int x; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1556991301 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lev;" ) @Export("paint") TilePaint paint; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Ldt;" + signature = "Lex;" ) @Export("model") TileModel model; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leu;" + signature = "Lep;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Len;" + signature = "Lez;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldu;" + signature = "Leo;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ldk;" + signature = "Ldn;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1422843585 + intValue = -540738689 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lea;" + signature = "[Lek;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 848654297 + intValue = 1811636757 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2052178019 + intValue = 1955523497 ) @Export("minPlane") int minPlane; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("q") + @ObfuscatedName("a") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 902411349 + intValue = -566961841 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -381817665 + intValue = 1786439481 ) - int field1650; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1422099387 - ) - int field1640; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1581215505 - ) - int field1652; + int field1678; @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 340621657 + ) + int field1679; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -596765939 + ) + int field1680; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldz;" + signature = "Leq;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -143,40 +140,215 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("t") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", - garbageValue = "20" + signature = "(I)V", + garbageValue = "-628211228" ) - static void method2927(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) { + 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; + } + } } } - if (class51.field431.startsWith("win") && !var3) { - ClientPacket.method3682(var0, 0); - return; + var6 = var5 * 192; + if (var6 > 98048) { + var6 = 98048; } - if (class51.field431.startsWith("mac")) { - class14.method174(var0, 1, var2); - return; + if (var6 < 32768) { + var6 = 32768; } - ClientPacket.method3682(var0, 2); + 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; } else { - ClientPacket.method3682(var0, 3); + if (KeyHandler.KeyHandler_pressedKeys[96]) { + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.camAngleDX / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { + Client.camAngleX = 383; } } - @ObfuscatedName("l") - public static int method2926(long var0) { - return (int)(var0 >>> 14 & 3L); + @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; } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 9bd7d405c0..b220a1bcc4 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -7,21 +7,21 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cf") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("sf") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lag;" ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("c") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1909413627 + intValue = 809859925 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1504274747 + intValue = -1293976509 ) @Export("quantity") int quantity; @@ -29,13 +29,13 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ldx;", - garbageValue = "-2133076860" + signature = "(I)Lel;", + garbageValue = "480835067" ) @Export("getModel") protected final Model getModel() { - return HealthBarDefinition.ItemDefinition_get(this.id).getModel(this.quantity); + return AbstractWorldMapData.ItemDefinition_get(this.id).getModel(this.quantity); } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index 9ac6e0bfd3..bc0cd5a173 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -3,240 +3,59 @@ 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("dk") +@ObfuscatedName("dn") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("n") - static int[] field1529; - @ObfuscatedName("dl") - @ObfuscatedSignature( - signature = "Lfw;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2033716223 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1107292427 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -23532387 + intValue = -626858235 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leq;" - ) - @Export("first") - Entity first; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" ) @Export("second") Entity second; - @ObfuscatedName("g") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1402854643 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -921383543 + ) + @Export("x") + int x; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" + ) + @Export("first") + Entity first; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lee;" ) @Export("third") Entity third; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -3787059622854517303L + longValue = 1345007712428644829L ) @Export("tag") long tag; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1744299723 + intValue = -720251669 ) @Export("height") int height; TileItemPile() { } - - @ObfuscatedName("c") - static double method2836(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "-128" - ) - static int method2834(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + var4; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4 * var3; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else if (var0 == ScriptOpcodes.INTERPOLATE) { - class320.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - class320.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "182557525" - ) - static final void method2835() { - Client.field759 = 0; - int var0 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); - int var1 = Language.baseY * 64 + (class192.localPlayer.y >> 7); - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field759 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field759 = 1; - } - - if (Client.field759 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field759 = 0; - } - - } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 3ea9f10a35..9d4e81d3af 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dt") +@ObfuscatedName("ex") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("w") - static int[] field1590; - @ObfuscatedName("k") - static int[] field1584; - @ObfuscatedName("q") - static int[] field1575; - @ObfuscatedName("z") - static int[] field1593; - @ObfuscatedName("y") - static int[] field1594; - @ObfuscatedName("f") - static final int[][] field1595; + @ObfuscatedName("g") + static int[] field1615; + @ObfuscatedName("i") + static int[] field1605; + @ObfuscatedName("a") + static int[] field1613; @ObfuscatedName("b") - static final int[][] field1592; - @ObfuscatedName("c") + static int[] field1623; + @ObfuscatedName("l") + static int[] field1620; + @ObfuscatedName("r") + static final int[][] field1617; + @ObfuscatedName("o") + static final int[][] field1626; + @ObfuscatedName("x") @Export("vertexX") int[] vertexX; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("vertexY") int[] vertexY; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("faceX") int[] faceX; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("faceY") int[] faceY; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("faceZ") int[] faceZ; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("isFlat") boolean isFlat; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("shape") int shape; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("rotation") int rotation; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("overlayRgb") int overlayRgb; static { - field1590 = new int[6]; - field1584 = new int[6]; - field1575 = new int[6]; - field1593 = new int[6]; - field1594 = new int[6]; - field1595 = 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}}; - field1592 = 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}}; + 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}}; + 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}}; } TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class TileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field1595[var1]; + int[] var24 = field1617[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -224,7 +224,7 @@ public final class TileModel { var27[var30] = var36; } - int[] var38 = field1592[var1]; + int[] var38 = field1626[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 684bd4879c..cbacf6f81f 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -2,47 +2,51 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ev") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("c") + @ObfuscatedName("sl") @ObfuscatedGetter( - intValue = 1255983765 + longValue = 8743466258274073007L + ) + static long field1802; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 2078169707 ) @Export("swColor") int swColor; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1109558685 + intValue = 321008861 ) @Export("seColor") int seColor; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1229444571 + intValue = -841305589 ) @Export("neColor") int neColor; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -906668191 + intValue = 658515107 ) @Export("nwColor") int nwColor; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2043941121 + intValue = -1776502689 ) @Export("texture") int texture; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("isFlat") boolean isFlat; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -860591445 + intValue = -1035631343 ) @Export("rgb") int rgb; @@ -57,52 +61,4 @@ public final class TilePaint { this.rgb = var6; this.isFlat = var7; } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lhc;I)V", - garbageValue = "-1948306061" - ) - public static void method3150(Huffman var0) { - class210.huffman = var0; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;Lii;Lii;I)V", - garbageValue = "811407537" - ) - public static void method3149(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - SequenceDefinition.SequenceDefinition_archive = var0; - Canvas.SequenceDefinition_animationsArchive = var1; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lgi;Llw;I)Lgs;", - garbageValue = "-1858964465" - ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = UserComparator5.method3488(); - 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; - } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 4af0637b54..1ed9ba3963 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,178 +4,282 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("ba") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("c") + @ObfuscatedName("qs") + @ObfuscatedSignature( + signature = "Ldz;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("x") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -118774103 + intValue = -824487333 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("e") - static byte[][][] field502; - @ObfuscatedName("i") - static byte[][][] field514; - @ObfuscatedName("g") - static byte[][][] field507; @ObfuscatedName("d") - static byte[][][] field518; - @ObfuscatedName("j") - static int[][] field509; - @ObfuscatedName("z") - static final int[] field508; - @ObfuscatedName("y") - static final int[] field513; - @ObfuscatedName("f") - static final int[] field506; + 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[] field516; + static final int[] field544; + @ObfuscatedName("l") + static final int[] field542; @ObfuscatedName("r") - static final int[] field503; - @ObfuscatedName("s") - static final int[] field517; - @ObfuscatedName("a") + static final int[] field541; + @ObfuscatedName("o") + static final int[] field547; + @ObfuscatedName("c") + static final int[] field546; + @ObfuscatedName("j") + static final int[] field552; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1347030255 + intValue = -408208893 ) - static int field512; - @ObfuscatedName("u") + static int field550; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 563851447 + intValue = 747701179 ) - static int field519; - @ObfuscatedName("gm") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + static int field548; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field508 = new int[]{1, 2, 4, 8}; - field513 = new int[]{16, 32, 64, 128}; - field506 = new int[]{1, 0, -1, 0}; - field516 = new int[]{0, -1, 0, 1}; - field503 = new int[]{1, -1, -1, 1}; - field517 = new int[]{-1, -1, 1, 1}; - field512 = (int)(Math.random() * 17.0D) - 8; - field519 = (int)(Math.random() * 33.0D) - 16; + 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; } - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-1076668980" + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "3344543" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return class105.parseIntCustomRadix(var0, 10, true); + } - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "(Ljw;I)Z", + garbageValue = "-1065823023" + ) + static boolean method1239(ObjectDefinition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectDefinition var4 = WorldMapSection2.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } } + } else if (var0.mapIconId != -1) { + return true; } - return var5; + return false; } - @ObfuscatedName("p") + @ObfuscatedName("gl") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "96" + signature = "(B)I", + garbageValue = "29" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; + static final int method1238() { + if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) { + return ScriptEvent.Client_plane; + } 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; + } } - @ObfuscatedName("gg") + @ObfuscatedName("jx") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1651271456" + signature = "(Lhe;II)I", + garbageValue = "2058882289" ) - static final void method1156() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == Clock.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field707); - if (var0.isFinished) { - var0.remove(); + 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; + + 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 = 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 (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 (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 (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; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; } else { - ServerBuild.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); + var5 = var8; } } - } else { - var0.remove(); + } 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 f14a24bc27..fb3ab50a8e 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,165 +4,176 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jr") @Implements("Timer") public class Timer { - @ObfuscatedName("c") + @ObfuscatedName("pc") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -5854066689636812733L + longValue = -8528403584903631725L ) - long field3575; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = -7523897199781097135L - ) - long field3568; - @ObfuscatedName("o") - public boolean field3569; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = 1307131764923953489L - ) - long field3570; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -1356096473288243273L - ) - long field3571; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 7486360679644359965L - ) - long field3567; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1117727777 - ) - int field3572; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1378192309 - ) - int field3574; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -966098649 - ) - int field3573; + long field3585; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 895210041 + longValue = 882289502926238735L ) - int field3576; + long field3577; + @ObfuscatedName("k") + public boolean field3581; + @ObfuscatedName("d") + @ObfuscatedGetter( + longValue = -5644251787443381573L + ) + long field3579; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = -4670592391922777709L + ) + long field3580; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 5855944608867181493L + ) + long field3576; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1581851235 + ) + int field3578; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1287309283 + ) + int field3583; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 2047115993 + ) + int field3584; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -763716735 + ) + int field3586; public Timer() { - this.field3575 = -1L; - this.field3568 = -1L; - this.field3569 = false; - this.field3570 = 0L; - this.field3571 = 0L; - this.field3567 = 0L; - this.field3572 = 0; - this.field3574 = 0; - this.field3573 = 0; - this.field3576 = 0; + 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("c") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "40" - ) - public void method5044() { - this.field3575 = WorldMapIcon_0.currentTimeMillis(); - } - - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1041013158" + garbageValue = "-2076802679" ) - public void method5045() { - if (this.field3575 != -1L) { - this.field3571 = WorldMapIcon_0.currentTimeMillis() - this.field3575; - this.field3575 = -1L; + public void method5051() { + this.field3585 = class217.currentTimeMillis(); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1352651256" + ) + public void method5050() { + if (this.field3585 != -1L) { + this.field3580 = class217.currentTimeMillis() - this.field3585; + this.field3585 = -1L; } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1882461656" + signature = "(IB)V", + garbageValue = "-21" ) - public void method5062(int var1) { - this.field3568 = WorldMapIcon_0.currentTimeMillis(); - this.field3572 = var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2083921672" - ) - public void method5047() { - if (this.field3568 != -1L) { - this.field3570 = WorldMapIcon_0.currentTimeMillis() - this.field3568; - this.field3568 = -1L; - } - - ++this.field3573; - this.field3569 = true; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-510534855" - ) - public void method5057() { - this.field3569 = false; - this.field3574 = 0; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1911888392" - ) - public void method5046() { - this.method5047(); + public void method5044(int var1) { + this.field3577 = class217.currentTimeMillis(); + this.field3578 = var1; } @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-822547863" + 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" ) @Export("write") public void write(Buffer var1) { - DynamicObject.method2291(var1, this.field3571); - DynamicObject.method2291(var1, this.field3570); - DynamicObject.method2291(var1, this.field3567); - var1.writeShort(this.field3572); - var1.writeShort(this.field3574); - var1.writeShort(this.field3573); - var1.writeShort(this.field3576); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "([BIS)I", - garbageValue = "11848" - ) - public static int method5068(byte[] var0, int var1) { - int var3 = -1; - - for (int var4 = 0; var4 < var1; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + long var2 = this.field3580; + var2 /= 10L; + if (var2 < 0L) { + var2 = 0L; + } else if (var2 > 65535L) { + var2 = 65535L; } - var3 = ~var3; - return var3; + var1.writeShort((int)var2); + long var4 = this.field3579; + var4 /= 10L; + if (var4 < 0L) { + var4 = 0L; + } else if (var4 > 65535L) { + var4 = 65535L; + } + + 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); } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index ec733b9150..fec80da4aa 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("kv") @Implements("TriBool") public class TriBool { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lju;" + signature = "Lkv;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,4 +33,71 @@ public class TriBool { TriBool() { } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1231904010" + ) + 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; + } + + if (var0.stream2 != null) { + Tiles.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } + } + + 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 f0c0fb3a4b..7a9f843ec0 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -5,18 +5,22 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eg") +@ObfuscatedName("ew") @Implements("UrlRequest") public class UrlRequest { + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Ldk;" + ) + @Export("soundCache") + public static SoundCache soundCache; @ObfuscatedName("x") - static int[][][] field1940; - @ObfuscatedName("c") @Export("url") final URL url; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("response0") volatile byte[] response0; @@ -24,20 +28,20 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "41" + signature = "(I)Z", + garbageValue = "-1424081834" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)[B", - garbageValue = "0" + signature = "(I)[B", + garbageValue = "484192233" ) @Export("getResponse") public byte[] getResponse() { @@ -45,398 +49,40 @@ public class UrlRequest { } @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "72" - ) - static void method3375() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - class2.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } - - if (var0.stream2 != null) { - class2.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - } - - @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(ILce;ZI)I", - garbageValue = "416833363" + garbageValue = "65535" ) - static int method3382(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = Clock.Client_plane; - int var9 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); - int var5 = Language.baseY * 64 + (class192.localPlayer.y >> 7); - GrandExchangeOfferUnitPriceComparator.getWorldMap().method6371(var3, var9, var5, true); + 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; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - String var16 = ""; - var11 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - GrandExchangeOfferUnitPriceComparator.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - GrandExchangeOfferUnitPriceComparator.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - GrandExchangeOfferUnitPriceComparator.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - GrandExchangeOfferUnitPriceComparator.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - WorldMapData_1.method731(var3, var12, false); - return 1; - } else if (var0 == 6620) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - WorldMapData_1.method731(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - var11 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - GrandExchangeOfferUnitPriceComparator.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - GrandExchangeOfferUnitPriceComparator.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - GrandExchangeOfferUnitPriceComparator.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - GrandExchangeOfferUnitPriceComparator.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - GrandExchangeOfferUnitPriceComparator.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - GrandExchangeOfferUnitPriceComparator.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - GrandExchangeOfferUnitPriceComparator.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; - GrandExchangeOfferUnitPriceComparator.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; - GrandExchangeOfferUnitPriceComparator.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - var7 = GrandExchangeOfferUnitPriceComparator.getWorldMap().method6411(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = GrandExchangeOfferUnitPriceComparator.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = GrandExchangeOfferUnitPriceComparator.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = PacketBufferNode.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = PacketBufferNode.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = PacketBufferNode.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = PacketBufferNode.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "124" - ) - static final boolean method3383(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; + return 2; } } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 47254c5cbb..59751e6717 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,16 +10,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("ey") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("c") + @ObfuscatedName("fx") + @ObfuscatedSignature( + signature = "Llt;" + ) + static AbstractSocket field1960; + @ObfuscatedName("gb") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("x") @Export("thread") final Thread thread; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("requests") Queue requests; @@ -30,10 +38,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/net/URL;I)Leg;", - garbageValue = "-838754437" + signature = "(Ljava/net/URL;B)Lew;", + garbageValue = "81" ) @Export("request") public UrlRequest request(URL var1) { @@ -45,10 +53,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1550899791" + signature = "(B)V", + garbageValue = "0" ) @Export("close") public void close() { @@ -111,70 +119,9 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - class225.RunException_sendStackTrace((String)null, var17); + WorldMapDecorationType.RunException_sendStackTrace((String)null, var17); } } } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - signature = "(Lhn;IIZI)V", - garbageValue = "1992355059" - ) - @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.field2589 * var0.height / var0.field2590; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field2590 * var0.width / var0.field2589; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - - } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "372064004" - ) - static void method3373(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class301.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - WorldMapSprite.method427(var0, var1); - } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 92aa48c6e3..8fb7a6ebd9 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,20 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jd") @Implements("User") public class User implements Comparable { - @ObfuscatedName("v") - static boolean field3583; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lku;" ) @Export("username") Username username; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Lku;" ) @Export("previousUsername") Username previousUsername; @@ -24,40 +22,40 @@ public class User implements Comparable { User() { } - @ObfuscatedName("a") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(B)Ljz;", - garbageValue = "-7" + signature = "(I)Lku;", + garbageValue = "-1106641864" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("u") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1147653243" + garbageValue = "1751830464" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("ae") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "403246047" + garbageValue = "-1275191870" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)V", - garbageValue = "1456948401" + signature = "(Lku;Lku;S)V", + garbageValue = "255" ) @Export("set") void set(Username var1, Username var2) { @@ -69,10 +67,10 @@ public class User implements Comparable { } } - @ObfuscatedName("az") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljk;I)I", - garbageValue = "-746331144" + signature = "(Ljd;I)I", + garbageValue = "-1956183743" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index a432e6601c..5d5578b64e 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("ll") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("c") + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("HitSplatDefinition_spritesArchive") + public static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -15,10 +21,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljk;Ljk;I)I", - garbageValue = "-1803472234" + signature = "(Ljd;Ljd;I)I", + garbageValue = "-1609540202" ) @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 3c4c809370..aa37892007 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("fi") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("soundEffectsArchive") - static AbstractArchive soundEffectsArchive; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "1802952011" + signature = "(Lke;Lke;I)I", + garbageValue = "1762023297" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -37,802 +31,4 @@ public class UserComparator10 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1451340880" - ) - public static void method3476() { - 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("hr") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-2121954499" - ) - @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 = TilePaint.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(class65.selectedItemSlot); - var8.packetBuffer.writeShortLE(MusicPatch.selectedItemId); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); - var8.packetBuffer.method5623(FriendSystem.selectedItemWidget); - var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5624(FontName.selectedSpellWidget); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(Language.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(Messages.baseX * 64 + var0); - var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(Language.baseY * 64 + var1); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - var8.packetBuffer.method5787(Language.baseY * 64 + var1); - var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.writeInt(FriendSystem.selectedItemWidget); - var9.packetBuffer.writeIntME(class65.selectedItemSlot); - var9.packetBuffer.writeIntME(MusicPatch.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 = TilePaint.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(Client.selectedSpellChildIndex); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5622(FontName.selectedSpellWidget); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.writeByte(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 = TilePaint.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(var3); - var9.packetBuffer.method5604(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 = TilePaint.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5604(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 = TilePaint.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5787(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 = TilePaint.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5603(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 = TilePaint.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(MusicPatch.selectedItemId); - var9.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(class65.selectedItemSlot); - var9.packetBuffer.method5624(FriendSystem.selectedItemWidget); - var9.packetBuffer.method5787(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5623(FontName.selectedSpellWidget); - var9.packetBuffer.method5787(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); - var8.packetBuffer.writeIntME(Messages.baseX * 64 + var0); - var8.packetBuffer.method5624(FriendSystem.selectedItemWidget); - var8.packetBuffer.writeShort(class65.selectedItemSlot); - var8.packetBuffer.writeIntME(MusicPatch.selectedItemId); - var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(var3); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5623(FontName.selectedSpellWidget); - var8.packetBuffer.writeShort(Language.baseY * 64 + var1); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - var8.packetBuffer.method5787(var3); - var8.packetBuffer.method5787(Client.selectedSpellChildIndex); - var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5787(var3); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5787(var3); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(Messages.baseX * 64 + var0); - 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 = TilePaint.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(Messages.baseX * 64 + var0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - ServerBuild.scene.setViewportWalking(); - } else { - ServerBuild.scene.menuOpen(Clock.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var12; - Widget var16; - if (var2 == 24) { - var16 = Varps.getWidget(var1); - boolean var11 = true; - if (var16.contentType > 0) { - var11 = BufferedSink.method5915(var16); - } - - if (var11) { - var12 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var12); - } - } else { - if (var2 == 25) { - var16 = SpriteMask.getWidgetChild(var1, var0); - if (var16 != null) { - WorldMapManager.Widget_runOnTargetLeave(); - MusicPatchNode.selectSpell(var1, var0, class83.method2108(WorldMapIcon_0.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = PcmPlayer.method2542(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + PacketWriter.colorStartTag(16777215); - } else { - Client.selectedSpellName = PacketWriter.colorStartTag(65280) + var16.spellName + PacketWriter.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - KeyHandler.method848(); - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Varps.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var10 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; - ServerPacket.changeGameOptions(var10); - } - } else if (var2 == 29) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Varps.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var10 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; - ServerPacket.changeGameOptions(var10); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - WorldMapAreaData.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = SpriteMask.getWidgetChild(var1, var0); - NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(MusicPatch.selectedItemId); - var8.packetBuffer.method5787(class65.selectedItemSlot); - var8.packetBuffer.method5624(var1); - var8.packetBuffer.method5787(var0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5622(FriendSystem.selectedItemWidget); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 32) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5787(var3); - var8.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); - var8.packetBuffer.method5622(var1); - var8.packetBuffer.method5622(FontName.selectedSpellWidget); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 33) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 34) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(var3); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.method5622(var1); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 35) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(var0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5623(var1); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 36) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5622(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 37) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5624(var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5787(var0); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else { - if (var2 == 38) { - WorldMapManager.Widget_runOnTargetLeave(); - var16 = Varps.getWidget(var1); - Client.isItemSelected = 1; - class65.selectedItemSlot = var0; - FriendSystem.selectedItemWidget = var1; - MusicPatch.selectedItemId = var3; - NPCDefinition.invalidateWidget(var16); - Client.selectedItemName = PacketWriter.colorStartTag(16748608) + HealthBarDefinition.ItemDefinition_get(var3).name + PacketWriter.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5622(var1); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 40) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5623(var1); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeShortLE(var0); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 41) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5624(var1); - var8.packetBuffer.method5787(var0); - var8.packetBuffer.method5787(var3); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 42) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5622(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - } else if (var2 == 43) { - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5787(var0); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.method5624(var1); - Client.packetWriter.addNode(var8); - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = 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 = TilePaint.getPacketBufferNode(ClientPacket.field2282, 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 = TilePaint.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.method5602(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 = TilePaint.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.writeByte(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 = TilePaint.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(var3); - var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5787(var3); - Client.packetWriter.addNode(var9); - } - } else { - label982: { - if (var2 != 57) { - if (var2 == 58) { - var16 = SpriteMask.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5787(Client.field802); - var9.packetBuffer.writeShortLE(var0); - var9.packetBuffer.method5623(var1); - var9.packetBuffer.writeShortLE(var16.itemId); - var9.packetBuffer.method5623(FontName.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - break label982; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeShort(Language.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - break label982; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - break label982; - } - - 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) { - var12 = TilePaint.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(var17.id); - Client.packetWriter.addNode(var12); - } - } - break label982; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = TilePaint.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - break label982; - } - - if (var2 == 1005) { - var16 = Varps.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - ClientPreferences.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + HealthBarDefinition.ItemDefinition_get(var3).name); - } else { - var9 = TilePaint.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - - Client.field751 = 0; - Skeleton.field1793 = Varps.getWidget(var1); - Client.field752 = var0; - break label982; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1012) { - WorldMapIcon_0.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label982; - } - } - - var16 = SpriteMask.getWidgetChild(var1, var0); - if (var16 != null) { - NPC.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - NPCDefinition.invalidateWidget(Varps.getWidget(FriendSystem.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - WorldMapManager.Widget_runOnTargetLeave(); - } - - if (Skeleton.field1793 != null && Client.field751 == 0) { - NPCDefinition.invalidateWidget(Skeleton.field1793); - } - - } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index e780066e2d..7c36f801f8 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -7,19 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lh") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ldl;" + signature = "[Lch;" ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("c") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -27,10 +21,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljk;Ljk;I)I", - garbageValue = "258601457" + signature = "(Ljd;Ljd;I)I", + garbageValue = "-426139063" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 054a2154da..1145db98ff 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,6 +1,3 @@ -import java.io.File; -import java.io.RandomAccessFile; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -9,7 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fp") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("c") + @ObfuscatedName("pl") + @ObfuscatedSignature( + signature = "Llg;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -17,10 +20,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "-1179985017" + signature = "(Lke;Lke;I)I", + garbageValue = "1767041351" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -35,113 +38,23 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "1177059768" + signature = "(Lch;S)V", + garbageValue = "5308" ) - @Export("getFile") - public static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "184774945" - ) - @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("ar") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-49" - ) - static int method3499(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1097 - 7.0D) * 256.0D); - } - - @ObfuscatedName("fu") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-62" - ) - static final void method3497(boolean var0) { - if (var0) { - Client.field682 = Login.field1185 ? class160.field1996 : class160.field1995; - } else { - LinkedHashMap var1 = WorldMapSection2.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.field682 = var1.containsKey(var5) ? class160.field1994 : class160.field1993; - } - - } - - @ObfuscatedName("fv") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "762095007" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class43.pcmPlayer1 != null) { - class43.pcmPlayer1.run(); - } - - if (WorldMapLabelSize.pcmPlayer0 != null) { - WorldMapLabelSize.pcmPlayer0.run(); + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + ArchiveLoader.method1254(var0.isMembersOnly()); } + 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 12dea3748b..7e8af183d1 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,17 +1,19 @@ -import java.io.IOException; 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("ez") +@ObfuscatedName("ff") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("r") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("c") + @ObfuscatedName("ot") + @ObfuscatedSignature( + signature = "Lcp;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -19,10 +21,10 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "-1549144493" + signature = "(Lke;Lke;I)I", + garbageValue = "1812606392" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { @@ -37,73 +39,25 @@ public class UserComparator4 implements Comparator { return this.compare_bridged((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("c") + @ObfuscatedName("fy") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "80" + signature = "(IB)I", + garbageValue = "120" ) - static void method3451() { - 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; - } - + static int method3482(int var0) { + return var0 * 3 + 600; } - @ObfuscatedName("m") + @ObfuscatedName("gy") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "0" + signature = "(III)V", + garbageValue = "1975650180" ) - static final int method3450(int var0, int var1) { - int var2 = class289.method5358(var0 - 1, var1 - 1) + class289.method5358(var0 + 1, var1 - 1) + class289.method5358(var0 - 1, 1 + var1) + class289.method5358(1 + var0, var1 + 1); - int var3 = class289.method5358(var0 - 1, var1) + class289.method5358(1 + var0, var1) + class289.method5358(var0, var1 - 1) + class289.method5358(var0, var1 + 1); - int var4 = class289.method5358(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1183662404" - ) - static final void method3442(boolean var0) { - UserComparator3.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.field800 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field800 = true; - } + 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); } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 720e611a54..0725847680 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -2,18 +2,11 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fl") +@ObfuscatedName("fc") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -21,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "-1009483697" + signature = "(Lke;Lke;I)I", + garbageValue = "261090852" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -43,375 +36,85 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Lgs;", - garbageValue = "-2093549834" + signature = "(I)V", + garbageValue = "-1985272675" ) - public static PacketBufferNode method3488() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + public static void method3520() { + KitDefinition.KitDefinition_cached.clear(); } - @ObfuscatedName("u") + @ObfuscatedName("gf") @ObfuscatedSignature( - signature = "(ILce;ZB)I", + 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" ) - static int method3491(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - ClientPreferences.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - class320.Interpreter_intStackSize -= 2; - InterfaceParent.performPlayerAnimation(class192.localPlayer, Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1095) { - Interpreter.field1094 = true; - } + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); - return 1; + 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 { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var10 = 0; - if (class248.isNumber(var3)) { - var10 = VerticalAlignment.parseInt(var3); - } + return var1.length() > 6 ? " " + class297.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class297.colorStartTag(16776960) + var1 + ""; + } + } - PacketBufferNode var12 = TilePaint.getPacketBufferNode(ClientPacket.field2251, 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[--Message.Interpreter_stringStackSize]; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2203, 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[--class320.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - ScriptEvent.method1203(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - class320.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - Widget var13 = Varps.getWidget(var9); - Strings.clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - class320.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? class186.field2331 : MidiPcmStream.field2444; - Strings.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - ArchiveLoader.mouseCam = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - WorldMapSection2.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - WorldMapData_1.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - class215.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var14 = TilePaint.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Message.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = TilePaint.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + Buddy.stringCp1252NullTerminatedByteSize(var7) + Buddy.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.method5602(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--class320.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[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - ObjectSound.setTapToDrop(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Message.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - class320.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - class320.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Username.canvasWidth; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - class320.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field808 = 3; - Client.field664 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field808 = 2; - Client.field664 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field808 = 0; - return 1; - } else if (var0 == 3139) { - Client.field808 = 1; - return 1; - } else if (var0 == 3140) { - Client.field808 = 3; - Client.field664 = var2 ? class186.field2331.id : MidiPcmStream.field2444.id; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - WorldMapSection2.clientPreferences.hideUsername = var8; - WorldMapData_1.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - WorldMapSection2.clientPreferences.rememberedUsername = ""; - WorldMapData_1.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++class320.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[--class320.Interpreter_intStackSize] == 1; - if (var8 == WorldMapSection2.clientPreferences.titleMusicDisabled) { - WorldMapSection2.clientPreferences.titleMusicDisabled = !var8; - WorldMapData_1.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class14.method170(); - return 1; - } else if (var0 == 3155) { - --Message.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - class320.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --class320.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --class320.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --Message.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --class320.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --class320.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - class320.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - class320.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - class320.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --class320.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --Message.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --Message.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } - } + @ObfuscatedName("jt") + @ObfuscatedSignature( + signature = "(Lhe;I)V", + garbageValue = "-1600087023" + ) + 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; } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field945; + } else { + var0.spriteId2 = Client.field946; + } + + } 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; } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index a8dc50d7a7..38e97ac252 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,16 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fx") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "[Llt;" - ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("c") + @ObfuscatedName("s") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -20,10 +17,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;B)I", - garbageValue = "-119" + signature = "(Lke;Lke;I)I", + garbageValue = "1973806284" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 1406cdd2e4..b849851171 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,18 +1,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("fv") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -625495169 - ) - static int field1978; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "1453601865" + signature = "(Lke;Lke;I)I", + garbageValue = "-1450384887" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,12 +32,18 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "941993017" + signature = "(Liy;III)Z", + garbageValue = "-1163904871" ) - public static void method3481() { - StructDefinition.StructDefinition_cached.clear(); + 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; + } } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 4778372566..bff9bd753e 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,19 +1,12 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("fo") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("dk") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -21,10 +14,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "-1753489227" + signature = "(Lke;Lke;I)I", + garbageValue = "-956709758" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -43,61 +36,127 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("c") + @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-257658019" + signature = "(B)I", + garbageValue = "87" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (World.World_request == null) { - World.World_request = WorldMapData_0.urlRequester.request(new URL(StructDefinition.field3307)); - } else if (World.World_request.isDone()) { - byte[] var0 = World.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class96.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class96.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(); + static final int method3503() { + if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) { + return ScriptEvent.Client_plane; + } else { + int var0 = 3; + if (class74.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; } - Interpreter.sortWorlds(class96.World_worlds, 0, class96.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - World.World_request = null; - return true; + 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; + } + } + } + } } - } catch (Exception var4) { - var4.printStackTrace(); - World.World_request = null; - } - return false; - } + 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; + } - @ObfuscatedName("ke") - @ObfuscatedSignature( - signature = "(Lhn;IIIB)V", - garbageValue = "58" - ) - @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) { - Entity.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + return var0; } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + return ScriptEvent.Client_plane; } - } } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 0dd74e8ed9..810836e27d 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,18 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("fd") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = 76612023 + @ObfuscatedName("eo") + @ObfuscatedSignature( + signature = "Lih;" ) - static int field1965; - @ObfuscatedName("c") + @Export("archive18") + static Archive archive18; + @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -20,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lje;Lje;I)I", - garbageValue = "-393804908" + signature = "(Lke;Lke;I)I", + garbageValue = "-54374446" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,57 +38,173 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lce;", - garbageValue = "-1024902697" + signature = "(II)Ljn;", + garbageValue = "-1711395255" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); + @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 = MilliClock.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = Clock.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; + 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; } } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lkx;", - garbageValue = "-1930566086" + signature = "(B)Lgq;", + garbageValue = "-87" ) - public static PrivateChatMode method3461(int var0) { - PrivateChatMode[] var1 = class289.method5359(); + public static PacketBufferNode method3496() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field3787) { - return var3; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1233574382" + ) + 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]; + class51.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; + } } + + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } - return null; } @ObfuscatedName("v") - static final void method3460(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(Lcx;I)V", - garbageValue = "1045276574" - ) - public static final void method3462(class99 var0) { - PcmPlayer.pcmPlayerProvider = var0; + public static int method3500(long var0) { + return (int)(var0 >>> 7 & 127L); } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index d1491363be..fa30605a75 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -8,34 +8,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jm") +@ObfuscatedName("kw") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1736832459 + intValue = 359260523 ) @Export("capacity") final int capacity; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 114939403 + intValue = 1553317273 ) @Export("size") int size; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Ljk;" + signature = "[Ljd;" ) @Export("array") User[] array; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("comparator") Comparator comparator; @@ -48,26 +48,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)Ljk;", - garbageValue = "30683" + signature = "(I)Ljd;", + garbageValue = "-1332552421" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)[Ljk;", - garbageValue = "19" + signature = "(II)[Ljd;", + garbageValue = "-667029686" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "847313587" + garbageValue = "1068929306" ) @Export("clear") public void clear() { @@ -77,30 +77,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-444681526" + signature = "(B)I", + garbageValue = "4" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1093222971" + garbageValue = "1500565158" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; + return this.capacity == this.size; } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljz;I)Z", - garbageValue = "645077874" + signature = "(Lku;I)Z", + garbageValue = "330121019" ) @Export("contains") public boolean contains(Username var1) { @@ -111,10 +111,10 @@ public abstract class UserList { } } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljz;I)Ljk;", - garbageValue = "111553486" + signature = "(Lku;I)Ljd;", + garbageValue = "2044020824" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -122,30 +122,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljz;I)Ljk;", - garbageValue = "-632690223" + signature = "(Lku;I)Ljd;", + garbageValue = "-678771148" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("y") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljz;B)Ljk;", - garbageValue = "-97" + signature = "(Lku;I)Ljd;", + garbageValue = "1317746514" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("f") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljz;I)Z", - garbageValue = "379093551" + signature = "(Lku;I)Z", + garbageValue = "-734937712" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -160,8 +160,8 @@ public abstract class UserList { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljk;I)V", - garbageValue = "144802420" + signature = "(Ljd;I)V", + garbageValue = "-941355814" ) @Export("remove") final void remove(User var1) { @@ -172,20 +172,20 @@ public abstract class UserList { } } - @ObfuscatedName("u") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljz;I)Ljk;", - garbageValue = "450603537" + signature = "(Lku;I)Ljd;", + garbageValue = "-2093018234" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("ae") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljz;Ljz;B)Ljk;", - garbageValue = "0" + signature = "(Lku;Lku;B)Ljd;", + garbageValue = "50" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -200,10 +200,10 @@ public abstract class UserList { } } - @ObfuscatedName("af") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(II)Ljk;", - garbageValue = "1668205012" + signature = "(IS)Ljd;", + garbageValue = "-13330" ) @Export("get") public final User get(int var1) { @@ -214,10 +214,10 @@ public abstract class UserList { } } - @ObfuscatedName("az") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1810920855" + signature = "(S)V", + garbageValue = "5757" ) @Export("sort") public final void sort() { @@ -229,10 +229,10 @@ public abstract class UserList { } - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Ljk;Ljz;Ljz;I)V", - garbageValue = "-1039891004" + signature = "(Ljd;Lku;Lku;I)V", + garbageValue = "577990406" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -241,10 +241,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("aj") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljk;I)I", - garbageValue = "-147054371" + signature = "(Ljd;I)I", + garbageValue = "-1683425809" ) @Export("indexOf") final int indexOf(User var1) { @@ -257,10 +257,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("au") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Ljk;I)V", - garbageValue = "1037986229" + signature = "(Ljd;B)V", + garbageValue = "28" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -274,20 +274,20 @@ public abstract class UserList { } } - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljk;B)V", - garbageValue = "127" + signature = "(Ljd;I)V", + garbageValue = "1612214268" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Ljk;I)V", - garbageValue = "2145132082" + signature = "(Ljd;I)V", + garbageValue = "1080849523" ) @Export("mapPut") final void mapPut(User var1) { @@ -301,10 +301,10 @@ public abstract class UserList { } - @ObfuscatedName("aq") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "45023574" + signature = "(IB)V", + garbageValue = "-23" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -315,20 +315,20 @@ public abstract class UserList { } - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "186565478" + signature = "(B)V", + garbageValue = "-18" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;I)V", - garbageValue = "-144770664" + garbageValue = "-1901322261" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -340,167 +340,201 @@ public abstract class UserList { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IILfk;Lfv;I)Z", - garbageValue = "715183629" + signature = "(Liy;S)V", + garbageValue = "32619" ) - public static final boolean method5167(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class173.directions[var6][var7] = 99; - class173.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class173.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class173.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class173.bufferX[var11]; - var5 = class173.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(1, var4, var5, var3)) { - ChatChannel.field1289 = var4; - class173.field2093 = var5; - return true; - } - - int var15 = class173.distances[var16][var17] + 1; - if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17] = 2; - class173.distances[var16 - 1][var17] = var15; - } - - if (var16 < 127 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17] = 8; - class173.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 - 1] = 1; - class173.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 + 1] = 4; - class173.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 - 1] = 3; - class173.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 127 && var17 > 0 && class173.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) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 - 1] = 9; - class173.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 127 && class173.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) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 + 1] = 6; - class173.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 127 && var17 < 127 && class173.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) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 + 1] = 12; - class173.distances[var16 + 1][var17 + 1] = var15; - } - } - - ChatChannel.field1289 = var4; - class173.field2093 = var5; - return false; + public static void method5179(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-495480060" + signature = "(ILce;ZB)I", + garbageValue = "43" ) - static int method5212(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollX; + 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; + } + + 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_GETSCROLLY) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollY; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ItemContainer.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.text; + } 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_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollWidth; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ItemContainer.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollHeight; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ItemContainer.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelZoom; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ItemContainer.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleX; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ItemContainer.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleZ; + } 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_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleY; + } 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_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + } 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; } else { - return 2; + 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); + } + + 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; + } else { + return 2; + } + } } } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 7db9e28219..0534a391dc 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,39 +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("jz") +@ObfuscatedName("ku") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -624446357 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("ap") - @Export("client") - @ObfuscatedSignature( - signature = "Lclient;" - ) - static Client client; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("name") String name; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lmv;)V" + signature = "(Ljava/lang/String;Lmx;)V" ) public Username(String var1, LoginType var2) { this.name = var1; @@ -64,24 +45,144 @@ public class Username implements Comparable { --var6; } - int var13 = var6 - var5; - if (var13 >= 1 && var13 <= TaskHandler.method3540(var2)) { - StringBuilder var12 = new StringBuilder(var13); + 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); - if (Projectile.method2160(var10)) { - char var11 = Decimator.method2597(var10); - if (var11 != 0) { - var12.append(var11); + 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 (var12.length() == 0) { + if (var15.length() == 0) { var4 = null; } else { - var4 = var12.toString(); + var4 = var15.toString(); } } else { var4 = null; @@ -91,30 +192,30 @@ public class Username implements Comparable { this.cleanName = var4; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-49" + signature = "(I)Ljava/lang/String;", + garbageValue = "-317689789" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "750587090" + garbageValue = "-1005152425" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljz;B)I", - garbageValue = "-33" + signature = "(Lku;B)I", + garbageValue = "-36" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -152,13 +253,21 @@ public class Username implements Comparable { return this.compareToTyped((Username)var1); } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-22" + signature = "(Liy;Ljava/lang/String;Ljava/lang/String;B)[Lle;", + garbageValue = "93" ) - @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; + 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; } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index d4109db473..6b5e73e43f 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("jh") +@ObfuscatedName("kt") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ky") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "(I)Ljz;", - garbageValue = "2135870107" + signature = "(I)Lku;", + garbageValue = "-1860083598" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 3c2c36d203..81e54a7ee9 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -4,35 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("iu") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leh;" + signature = "Liy;" + ) + @Export("VarbitDefinition_archive") + public static AbstractArchive VarbitDefinition_archive; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Leg;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("lz") - @ObfuscatedSignature( - signature = "Lhn;" - ) - static Widget field3296; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1323501577 + intValue = -927244413 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1019762327 + intValue = -326860353 ) @Export("startBit") public int startBit; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1631697359 + intValue = -1659687913 ) @Export("endBit") public int endBit; @@ -41,10 +42,10 @@ public class VarbitDefinition extends DualNode { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "2025380106" + signature = "(Lkb;B)V", + garbageValue = "113" ) @Export("decode") public void decode(Buffer var1) { @@ -58,10 +59,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-1332372720" + signature = "(Lkb;II)V", + garbageValue = "842018241" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index f6d2727552..c459e7c93a 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,22 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("it") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("VarcInt_cached") public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("persist") public boolean persist; @@ -30,86 +30,31 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-1301624128" + signature = "(Lkb;B)V", + garbageValue = "-75" ) - public void method4478(Buffer var1) { + public void method4487(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4477(var1, var2); + this.method4488(var1, var2); } } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "7" + signature = "(Lkb;II)V", + garbageValue = "-1942328984" ) - void method4477(Buffer var1, int var2) { + void method4488(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(Lhn;IIIIIIB)V", - garbageValue = "-50" - ) - static final void method4485(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field712) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field712 = false; - int var7; - 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; - NPCDefinition.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - NPCDefinition.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - NPCDefinition.invalidateWidget(var0); - Client.field712 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - NPCDefinition.invalidateWidget(var0); - } - } - - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - signature = "(Lhn;I)Z", - garbageValue = "-1381346816" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 40c7f5eae7..9bb7b88614 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,30 +9,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("cp") @Implements("Varcs") public class Varcs { - @ObfuscatedName("o") + @ObfuscatedName("sm") + @ObfuscatedSignature( + signature = "Lmq;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("k") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("map") Map map; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("strings") String[] strings; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -8646841017490334521L + longValue = 4946671747010980607L ) - long field1249; + long field1281; Varcs() { this.unwrittenChanges = false; - int var1 = GrandExchangeOfferWorldComparator.archive2.getGroupFileCount(19); + int var1 = GrandExchangeOffer.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -46,7 +58,7 @@ public class Varcs { byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); var4 = new VarcInt(); if (var5 != null) { - var4.method4478(new Buffer(var5)); + var4.method4487(new Buffer(var5)); } VarcInt.VarcInt_cached.put(var4, (long)var2); @@ -57,18 +69,18 @@ public class Varcs { } var2 = 0; - if (GrandExchangeOfferWorldComparator.archive2.method4348(15)) { - var2 = GrandExchangeOfferWorldComparator.archive2.getGroupFileCount(15); + if (GrandExchangeOffer.archive2.method4353(15)) { + var2 = GrandExchangeOffer.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1547810829" + garbageValue = "1118908426" ) @Export("setInt") void setInt(int var1, int var2) { @@ -79,10 +91,10 @@ public class Varcs { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "-66" + garbageValue = "-101" ) @Export("getInt") int getInt(int var1) { @@ -90,20 +102,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "1774400510" + garbageValue = "1504120549" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "104" + signature = "(II)Ljava/lang/String;", + garbageValue = "-1244262565" ) @Export("getString") String getString(int var1) { @@ -111,30 +123,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)V", - garbageValue = "-92" + signature = "(ILjava/lang/String;S)V", + garbageValue = "10505" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-1676642086" + signature = "(IB)Ljava/lang/String;", + garbageValue = "61" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1665078788" + garbageValue = "1883661666" ) @Export("clearTransient") void clearTransient() { @@ -151,20 +163,20 @@ public class Varcs { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(ZI)Lmx;", - garbageValue = "-6839896" + signature = "(ZS)Lmb;", + garbageValue = "6254" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return WorldMapRectangle.getPreferencesFile("2", class14.field102.name, var1); + return KeyHandler.getPreferencesFile("2", WorldMapArchiveLoader.field3965.name, var1); } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2046783551" + garbageValue = "316912893" ) @Export("write") void write() { @@ -184,54 +196,55 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += Buddy.stringCp1252NullTerminatedByteSize((String)var7); + var2 += class234.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var23 = new Buffer(var2); - var23.writeByte(2); - var23.writeShort(var3); - Iterator var24 = this.map.entrySet().iterator(); + Buffer var24 = new Buffer(var2); + var24.writeByte(2); + var24.writeShort(var3); + Iterator var25 = this.map.entrySet().iterator(); - while (var24.hasNext()) { - Entry var12 = (Entry)var24.next(); - int var13 = (Integer)var12.getKey(); - if (this.intsPersistence[var13]) { - var23.writeShort(var13); - Object var8 = var12.getValue(); - class3 var9 = class3.method51(var8.getClass()); - var23.writeByte(var9.field18); - class3.method35(var8, var23); + 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); } } - var1.write(var23.array, 0, var23.offset); - } catch (Exception var21) { + var1.write(var24.array, 0, var24.offset); + } catch (Exception var22) { } finally { try { var1.close(); - } catch (Exception var20) { + } catch (Exception var21) { } } this.unwrittenChanges = false; - this.field1249 = WorldMapIcon_0.currentTimeMillis(); + this.field1281 = class217.currentTimeMillis(); } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1384592680" + garbageValue = "349952581" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label231: { + label225: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -243,68 +256,67 @@ public class Varcs { } } - Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); - if (var16 >= 0 && var16 <= 2) { - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label231; - } - - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class3[] var10 = new class3[]{class3.field15, class3.field22, class3.field16}; - class3 var11 = (class3)WorldMapSection0.findEnumerated(var10, var9); - Object var12 = var11.method38(var15); - if (this.intsPersistence[var8]) { - this.map.put(var8, var12); - } - - ++var7; - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label231; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; - } - } - } - + Buffer var14 = new Buffer(var2); + if (var14.array.length - var14.offset < 1) { return; } - } catch (Exception var26) { - break label231; + + int var15 = var14.readUnsignedByte(); + if (var15 >= 0 && var15 <= 2) { + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { + var16 = var14.readUnsignedShort(); + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label225; + } + + 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; + } + } 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; + } + } + } + } catch (Exception var25) { + break label225; } finally { try { var1.close(); - } catch (Exception var25) { + } catch (Exception var24) { } } @@ -315,52 +327,83 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2106283374" + garbageValue = "973740896" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1249 < WorldMapIcon_0.currentTimeMillis() - 60000L) { + if (this.unwrittenChanges && this.field1281 < class217.currentTimeMillis() - 60000L) { this.write(); } } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "129228614" + garbageValue = "2008113856" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lii;Lii;I)Z", - garbageValue = "-141032975" + signature = "(I)V", + garbageValue = "906944643" ) - public static boolean method2212(AbstractArchive var0, AbstractArchive var1) { - WorldMapElement.WorldMapElement_archive = var1; - if (!var0.isFullyLoaded()) { - return false; - } else { - class218.WorldMapElement_count = var0.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class218.WorldMapElement_count]; - - for (int var2 = 0; var2 < class218.WorldMapElement_count; ++var2) { - byte[] var3 = var0.takeFile(35, var2); - WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); - if (var3 != null) { - WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); - WorldMapElement.WorldMapElement_cached[var2].method4449(); - } - } - - return true; + 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 1adbc53491..d63eedb537 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,30 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("ik") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("VarpDefinition_archive") public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -836426175 + intValue = 701979543 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1574872925 + intValue = -2041406857 ) @Export("type") public int type; @@ -40,10 +46,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "10" + signature = "(Lkb;I)V", + garbageValue = "888817873" ) @Export("decode") void decode(Buffer var1) { @@ -57,10 +63,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "1" + signature = "(Lkb;II)V", + garbageValue = "-478549548" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -69,4 +75,19 @@ 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 ea0352f8e0..8333968854 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,20 +1,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("ht") @Implements("Varps") public class Varps { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("o") + @ObfuscatedName("k") @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]; @@ -28,37 +43,4 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1638867489" - ) - static int method4043(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(II)Lhn;", - garbageValue = "1215015650" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (WorldMapLabel.Widget_interfaceComponents[var1] == null || WorldMapLabel.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = ScriptFrame.loadInterface(var1); - if (!var3) { - return null; - } - } - - return WorldMapLabel.Widget_interfaceComponents[var1][var2]; - } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 0a2d7555f4..e811b513a1 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,52 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("en") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("c") + @ObfuscatedName("z") + public static short[][] field1764; + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 1130865268298434617L - ) - static long field1752; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lli;" - ) - static IndexedSprite field1753; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lkp;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 707257177 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1141720523 + intValue = 1214687281 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1695799799 + intValue = -412976723 + ) + @Export("x") + int x; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1667952739 ) @Export("z") int z; - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1198697941 + intValue = 284274911 ) @Export("magnitude") int magnitude; @@ -58,7 +38,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Ldp;)V" + signature = "(Len;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -67,38 +47,34 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("o") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)J", - garbageValue = "2082657015" + signature = "([BI)Lkx;", + garbageValue = "-1694309156" ) - public static long method3063(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; + 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("gn") + @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1221286239" + signature = "(S)V", + garbageValue = "-399" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field859 = 0L; - if (var0 >= 2) { - Client.isResizable = true; + static final void method3093() { + if (Client.logoutTimer > 0) { + Huffman.logOut(); } else { - Client.isResizable = false; + Client.timer.method5050(); + MouseRecorder.updateGameState(40); + UrlRequester.field1960 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); } - - if (Friend.getWindowedMode() == 1) { - Username.client.setMaxCanvasSize(765, 503); - } else { - Username.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - class238.method4415(); - } - } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 22b97d645b..ff7fe25831 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,38 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("ie") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lic;" + signature = "Lie;" ) - field3196(2, 0), - @ObfuscatedName("t") + field3193(0, 0), + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + signature = "Lie;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(0, 1), - @ObfuscatedName("o") + VerticalAlignment_centered(1, 1), + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lic;" + signature = "Lie;" ) - field3198(1, 2); + field3196(2, 2); - @ObfuscatedName("l") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1614385539 + intValue = 1209420553 ) @Export("value") public final int value; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 272968923 + intValue = -1378606847 ) @Export("id") final int id; @@ -45,68 +42,27 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)J", - garbageValue = "1244217494" + signature = "(III)V", + garbageValue = "-738770564" ) - public static long method4424(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; - } + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { + class74.method1321(WorldMapRegion.archive11, var0, 0, Client.musicVolume, false); + Client.field915 = true; } - while (var1 % 37L == 0L && 0L != var1) { - var1 /= 37L; - } - - return var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1671974094" - ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return KitDefinition.parseIntCustomRadix(var0, 10, true); - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "116" - ) - static String method4426(int var0) { - if (var0 < 0) { - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; - } } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 8850f396da..5221288ad8 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,65 +1,56 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("da") +@ObfuscatedName("ei") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("ViewportMouse_isInViewport") - public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("t") + static boolean ViewportMouse_isInViewport; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1731432655 + intValue = -3434347 ) @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2096475085 + intValue = -1088872185 ) @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1611746101 + intValue = 1287512303 ) - static int field1729; - @ObfuscatedName("g") + static int field1756; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -684242185 + intValue = -128272745 ) - static int field1731; - @ObfuscatedName("d") + static int field1753; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -658996083 + intValue = 2142328087 ) - static int field1736; - @ObfuscatedName("j") + static int field1758; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1011039225 - ) - static int field1733; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1153902533 - ) - static int field1742; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1095575825 + intValue = 148493353 ) @Export("ViewportMouse_entityCount") - public static int ViewportMouse_entityCount; - @ObfuscatedName("x") + static int ViewportMouse_entityCount; + @ObfuscatedName("h") @Export("ViewportMouse_entityTags") - public static long[] ViewportMouse_entityTags; + static long[] ViewportMouse_entityTags; static { ViewportMouse_isInViewport = false; @@ -70,272 +61,115 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("t") - static double method3061(double var0, double var2, double var4) { - return TileItemPile.method2836((var0 - var2) / var4) / var4; - } - - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1872781717" + signature = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-880025172" ) - public static int method3059(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0; + @Export("getFile") + public static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); } else { - return var2 == 2 ? 7 - var1 : var0; - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1104105387" - ) - @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 (WorldMapSection2.clientPreferences.rememberedUsername != null) { - Login.Login_username = WorldMapSection2.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; } else { - Client.Login_isUsernameRemembered = false; - } - } + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; - class81.method2099(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1906637930" - ) - static int method3037(int var0, Script var1, boolean var2) { - Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "(Lhn;IIS)V", - garbageValue = "-7160" - ) - static final void method3060(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = PcmPlayer.method2542(var0); - if (var3 != null) { - GraphicsObject.insertMenuItemNoShift(var3, PacketWriter.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - GraphicsObject.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var13; - if (var0.type == 2) { - var13 = 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 (var13 < 20) { - var6 += var0.inventoryXOffsets[var13]; - var7 += var0.inventoryYOffsets[var13]; + 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; } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var13; - FloorDecoration.field1604 = var0; - if (var0.itemIds[var13] > 0) { - ItemDefinition var8 = HealthBarDefinition.ItemDefinition_get(var0.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { - if (var0.id != FriendSystem.selectedItemWidget || var13 != class65.selectedItemSlot) { - GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); - } - } else if (Client.isSpellSelected && WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { - if ((NetSocket.selectedSpellFlags & 16) == 16) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); - } - } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop && Players.method2201()) { - var10 = var8.getShiftClickIndex(); - } - - int var11; - if (WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { - for (var11 = 4; var11 >= 3; --var11) { - if (var10 != var11) { - GrandExchangeEvents.addWidgetItemMenuItem(var0, var8, var13, var11, false); - } - } - } - - if (class268.method5042(WorldMapIcon_0.getWidgetClickMask(var0))) { - GraphicsObject.insertMenuItemNoShift("Use", PacketWriter.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); - } - - if (WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { - for (var11 = 2; var11 >= 0; --var11) { - if (var11 != var10) { - GrandExchangeEvents.addWidgetItemMenuItem(var0, var8, var13, var11, false); - } - } - - if (var10 >= 0) { - GrandExchangeEvents.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; - } - - GraphicsObject.insertMenuItemNoShift(var9[var11], PacketWriter.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); - } - } - } - - GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); - } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; } + } catch (Exception var7) { } - ++var13; + throw new RuntimeException(); } } } + } - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (NPC.method2088(WorldMapIcon_0.getWidgetClickMask(var0)) && (NetSocket.selectedSpellFlags & 32) == 32) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var13 = 9; var13 >= 5; --var13) { - String var14 = class80.method2098(var0, var13); - if (var14 != null) { - GraphicsObject.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); - } + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "-3489" + ) + 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; + } else { + Client.alternativeScrollbarWidth = 0; + } + + 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; } - var3 = PcmPlayer.method2542(var0); - if (var3 != null) { - GraphicsObject.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + ItemContainer.invalidateWidget(var0); + Client.field746 = true; + } + } - for (var4 = 4; var4 >= 0; --var4) { - String var15 = class80.method2098(var0, var4); - if (var15 != null) { - class160.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2713); - } - } - - if (AttackOption.method2117(WorldMapIcon_0.getWidgetClickMask(var0))) { - GraphicsObject.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } + 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); } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 15366c7df6..e1b170e720 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("cl") +@ObfuscatedName("dq") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("dimensions") int dimensions; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("entries") int entries; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("e") - int[] field1334; - @ObfuscatedName("i") - float[][] field1335; - @ObfuscatedName("g") + @ObfuscatedName("d") + int[] field1362; + @ObfuscatedName("w") + float[][] field1360; + @ObfuscatedName("v") @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(CollisionMap.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(PacketBufferNode.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2396(); + this.method2445(); 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.field1334 = new int[var7]; + this.field1362 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1334[var8] = VorbisSample.readBits(var5); + this.field1362[var8] = VorbisSample.readBits(var5); } - this.field1335 = new float[this.entries][this.dimensions]; + this.field1360 = 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.field1334[var12] * var16 + var15 + var9; - this.field1335[var8][var11] = var13; + float var13 = (float)this.field1362[var12] * var16 + var15 + var9; + this.field1360[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.field1334[var10] * var16 + var15 + var9; - this.field1335[var8][var11] = var17; + float var17 = (float)this.field1362[var10] * var16 + var15 + var9; + this.field1360[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("t") - void method2396() { + @ObfuscatedName("m") + void method2445() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("o") - int method2398() { + @ObfuscatedName("k") + int method2452() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { } @@ -217,41 +217,18 @@ public class VorbisCodebook { return ~this.keys[var1]; } - @ObfuscatedName("e") - float[] method2397() { - return this.field1335[this.method2398()]; + @ObfuscatedName("d") + float[] method2455() { + return this.field1360[this.method2452()]; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; - - while (true) { - int var4 = var2; - int var5 = var1; - - int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { - if ((var5 & 1) != 0) { - var6 *= var4; - } - - var4 *= var4; - } - - int var3; - if (var5 == 1) { - var3 = var4 * var6; - } else { - var3 = var6; - } - - if (var3 <= var0) { - return var2; - } - - --var2; + int var2; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; SecureRandomFuture.method2226(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 a31cc1bb92..9e2e9ccfb5 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("dm") +@ObfuscatedName("db") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("c") - static final int[] field1384; - @ObfuscatedName("t") + @ObfuscatedName("x") + static final int[] field1417; + @ObfuscatedName("m") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("m") - static int[] field1387; - @ObfuscatedName("p") - static int[] field1390; - @ObfuscatedName("h") - static boolean[] field1389; - @ObfuscatedName("o") - int[] field1385; @ObfuscatedName("e") + static int[] field1418; + @ObfuscatedName("s") + static int[] field1412; + @ObfuscatedName("p") + static boolean[] field1419; + @ObfuscatedName("k") + int[] field1408; + @ObfuscatedName("d") @Export("multiplier") int multiplier; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("subclassBooks") int[][] subclassBooks; static { - field1384 = new int[]{256, 128, 86, 64}; + field1417 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var9]]; } - this.field1385 = new int[var5]; - this.field1385[0] = 0; - this.field1385[1] = 1 << var4; + this.field1408 = new int[var5]; + this.field1408[0] = 0; + this.field1408[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.field1385[var5++] = VorbisSample.readBits(var4); + this.field1408[var5++] = VorbisSample.readBits(var4); } } - if (field1387 == null || field1387.length < var5) { - field1387 = new int[var5]; - field1390 = new int[var5]; - field1389 = new boolean[var5]; + if (field1418 == null || field1418.length < var5) { + field1418 = new int[var5]; + field1412 = new int[var5]; + field1419 = new boolean[var5]; } } } - @ObfuscatedName("o") - int method2472(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("k") + int method2532(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("e") - void method2481(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("d") + void method2514(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("i") + @ObfuscatedName("w") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field1387[var1]; - int var5 = field1390[var1]; - boolean var6 = field1389[var1]; + int var4 = field1418[var1]; + int var5 = field1412[var1]; + boolean var6 = field1419[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1387[var7]; + int var8 = field1418[var7]; if (var8 < var4) { - field1387[var3] = var8; - field1390[var3] = field1390[var7]; - field1389[var3] = field1389[var7]; + field1418[var3] = var8; + field1412[var3] = field1412[var7]; + field1419[var3] = field1419[var7]; ++var3; - field1387[var7] = field1387[var3]; - field1390[var7] = field1390[var3]; - field1389[var7] = field1389[var3]; + field1418[var7] = field1418[var3]; + field1412[var7] = field1412[var3]; + field1419[var7] = field1419[var3]; } } - field1387[var3] = var4; - field1390[var3] = var5; - field1389[var3] = var6; + field1418[var3] = var4; + field1412[var3] = var5; + field1419[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field1385.length; + int var2 = this.field1408.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field1387[var3] = this.field1385[var3]; + field1418[var3] = this.field1408[var3]; } - var3 = field1384[this.multiplier - 1]; - int var4 = CollisionMap.iLog(var3 - 1); - field1390[0] = VorbisSample.readBits(var4); - field1390[1] = VorbisSample.readBits(var4); + var3 = field1417[this.multiplier - 1]; + int var4 = PacketBufferNode.iLog(var3 - 1); + field1412[0] = VorbisSample.readBits(var4); + field1412[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]].method2398(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2452(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field1390[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2398() : 0; + field1412[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2452() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("d") - void method2464(float[] var1, int var2) { - int var3 = this.field1385.length; - int var4 = field1384[this.multiplier - 1]; - boolean[] var5 = field1389; - field1389[1] = true; + @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; var5[0] = true; int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = method2465(field1387, var6); - var8 = method2462(field1387, var6); - var9 = this.method2472(field1387[var7], field1390[var7], field1387[var8], field1390[var8], field1387[var6]); - var10 = field1390[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]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1389; - field1389[var8] = true; + boolean[] var14 = field1419; + field1419[var8] = true; var14[var7] = true; - field1389[var6] = true; + field1419[var6] = true; if (var10 >= var13) { - field1390[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1412[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1390[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1412[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1389[var6] = false; - field1390[var6] = var9; + field1419[var6] = false; + field1412[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1390[0] * this.multiplier; + var7 = field1412[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1389[var8]) { - var9 = field1387[var8]; - var10 = field1390[var8] * this.multiplier; - this.method2481(var6, var7, var9, var10, var1, var2); + if (field1419[var8]) { + var9 = field1418[var8]; + var10 = field1412[var8] * this.multiplier; + this.method2514(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("c") - static int method2465(int[] var0, int var1) { + @ObfuscatedName("x") + static int method2511(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MIN_VALUE; @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; } - @ObfuscatedName("t") - static int method2462(int[] var0, int var1) { + @ObfuscatedName("m") + static int method2519(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 cf6a2c8ef5..0b2092c769 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("dy") +@ObfuscatedName("dt") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("submaps") int submaps; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("mappingMux") int mappingMux; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 57b07f9c64..6b00c93b74 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dc") +@ObfuscatedName("dr") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("residueType") int residueType; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("begin") int begin; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("end") int end; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("partitionSize") int partitionSize; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("classifications") int classifications; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("classbook") int classbook; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("c") - void method2587(float[] var1, int var2, boolean var3) { + @ObfuscatedName("x") + void method2634(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].method2398(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2452(); 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.method2397(); + float[] var17 = var14.method2455(); 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.method2397(); + float[] var19 = var14.method2455(); 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 6191e6a761..14d5df7b72 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("cj") +@ObfuscatedName("dl") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lcl;" + signature = "[Ldq;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Ldm;" + signature = "[Ldb;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Ldc;" + signature = "[Ldr;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Ldy;" + signature = "[Ldt;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("k") + @ObfuscatedName("i") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("q") - static boolean field1362; - @ObfuscatedName("r") - static float[] field1363; - @ObfuscatedName("s") - static float[] field1364; @ObfuscatedName("a") - static float[] field1341; - @ObfuscatedName("u") - static float[] field1357; - @ObfuscatedName("ae") - static float[] field1367; - @ObfuscatedName("af") - static float[] field1368; - @ObfuscatedName("az") - static float[] field1369; - @ObfuscatedName("ax") - static int[] field1370; - @ObfuscatedName("aj") - static int[] field1371; + static boolean field1386; @ObfuscatedName("c") - byte[][] field1359; - @ObfuscatedName("t") + 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("x") + byte[][] field1381; + @ObfuscatedName("m") @Export("sampleRate") int sampleRate; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("sampleCount") int sampleCount; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("start") int start; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("end") int end; - @ObfuscatedName("g") - boolean field1346; - @ObfuscatedName("z") - float[] field1374; - @ObfuscatedName("y") - int field1353; - @ObfuscatedName("f") - int field1365; + @ObfuscatedName("v") + boolean field1387; @ObfuscatedName("b") - boolean field1355; - @ObfuscatedName("au") + float[] field1380; + @ObfuscatedName("l") + int field1388; + @ObfuscatedName("r") + int field1389; + @ObfuscatedName("o") + boolean field1384; + @ObfuscatedName("ar") @Export("samples") byte[] samples; - @ObfuscatedName("ay") - int field1373; - @ObfuscatedName("aa") - int field1344; + @ObfuscatedName("af") + int field1401; + @ObfuscatedName("at") + int field1402; static { - field1362 = false; + field1386 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("i") + @ObfuscatedName("w") @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.field1346 = true; + this.field1387 = true; } int var3 = var2.readInt(); - this.field1359 = new byte[var3][]; + this.field1381 = 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.field1359[var4] = var7; + this.field1381[var4] = var7; } } - @ObfuscatedName("d") - float[] method2425(int var1) { - VorbisSample_setData(this.field1359[var1], 0); + @ObfuscatedName("q") + float[] method2494(int var1) { + VorbisSample_setData(this.field1381[var1], 0); readBit(); - int var2 = readBits(CollisionMap.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(PacketBufferNode.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 = field1363; - var18.method2587(var19, var4 >> 1, var45); + float[] var19 = field1391; + var18.method2634(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2464(field1363, var4 >> 1); + VorbisSample_floors[var40].method2517(field1391, var4 >> 1); } - int var41; + int var42; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1363[var17] = 0.0F; + field1391[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; - var41 = var4 >> 3; - float[] var20 = field1363; + var42 = var4 >> 3; + float[] var43 = field1391; int var21; for (var21 = 0; var21 < var17; ++var21) { - var20[var21] *= 0.5F; + var43[var21] *= 0.5F; } for (var21 = var17; var21 < var4; ++var21) { - var20[var21] = -var20[var4 - var21 - 1]; + var43[var21] = -var43[var4 - var21 - 1]; } - float[] var44 = var3 ? field1367 : field1364; - float[] var22 = var3 ? field1368 : field1341; - float[] var23 = var3 ? field1369 : field1357; - int[] var24 = var3 ? field1371 : field1370; + float[] var44 = var3 ? field1395 : field1392; + float[] var22 = var3 ? field1396 : field1393; + float[] var23 = var3 ? field1397 : field1377; + int[] var24 = var3 ? field1369 : field1398; int var25; float var26; @@ -234,30 +234,30 @@ public class VorbisSample extends Node { float var28; float var29; for (var25 = 0; var25 < var40; ++var25) { - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; + var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1]; + var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3]; var28 = var44[var25 * 2]; var29 = var44[var25 * 2 + 1]; - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; + var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } float var30; float var31; - 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; + 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; var30 = var44[var17 - 4 - var25 * 4]; var31 = var44[var17 - 3 - var25 * 4]; - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = CollisionMap.iLog(var4 - 1); + var25 = PacketBufferNode.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 = 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 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 var38 = var44[var32 * var49]; float var39 = var44[var32 * var49 + 1]; - var20[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var20[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (var47 = 1; var47 < var41 - 1; ++var47) { + for (var47 = 1; var47 < var42 - 1; ++var47) { var48 = var24[var47]; if (var47 < var48) { var49 = var47 * 8; var50 = var48 * 8; - 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; + 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; } } for (var47 = 0; var47 < var17; ++var47) { - var20[var47] = var20[var47 * 2 + 1]; + var43[var47] = var43[var47 * 2 + 1]; } - 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) { + 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) { + for (var47 = 0; var47 < var42; ++var47) { var27 = var23[var47 * 2]; var28 = var23[var47 * 2 + 1]; - var29 = var20[var17 + var47 * 2]; - var30 = var20[var17 + var47 * 2 + 1]; - var31 = var20[var4 - 2 - var47 * 2]; - float var53 = var20[var4 - 1 - var47 * 2]; + var29 = var43[var17 + var47 * 2]; + var30 = var43[var17 + var47 * 2 + 1]; + var31 = var43[var4 - 2 - var47 * 2]; + float var53 = var43[var4 - 1 - var47 * 2]; float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var20[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var20[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; + var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; + var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var20[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var20[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; + var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; } for (var47 = 0; var47 < var40; ++var47) { - 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]; + 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]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var47 + (var4 - var40)] = -var20[var47]; + var43[var47 + (var4 - var40)] = -var43[var47]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var47] = var20[var40 + var47]; + var43[var47] = var43[var40 + var47]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var40 + var47] = -var20[var40 - var47 - 1]; + var43[var40 + var47] = -var43[var40 - var47 - 1]; } for (var47 = 0; var47 < var40; ++var47) { - var20[var17 + var47] = var20[var4 - var47 - 1]; + var43[var17 + var47] = var43[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 = field1363; + var10000 = field1391; 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 = field1363; + var10000 = field1391; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var42 = null; - if (this.field1353 > 0) { - var40 = var4 + this.field1353 >> 2; - var42 = new float[var40]; - int var43; - if (!this.field1355) { - for (var41 = 0; var41 < this.field1365; ++var41) { - var43 = var41 + (this.field1353 >> 1); - var42[var41] += this.field1374[var43]; + 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]; } } if (!var15) { - for (var41 = var8; var41 < var4 >> 1; ++var41) { - var43 = var42.length - (var4 >> 1) + var41; - var42[var43] += field1363[var41]; + for (var42 = var8; var42 < var4 >> 1; ++var42) { + var20 = var41.length - (var4 >> 1) + var42; + var41[var20] += field1391[var42]; } } } - float[] var46 = this.field1374; - this.field1374 = field1363; - field1363 = var46; - this.field1353 = var4; - this.field1365 = var12 - (var4 >> 1); - this.field1355 = var15; - return var42; + float[] var46 = this.field1380; + this.field1380 = field1391; + field1391 = var46; + this.field1388 = var4; + this.field1389 = var12 - (var4 >> 1); + this.field1384 = var15; + return var41; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "([I)Lcv;" + signature = "([I)Ldm;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field1353 = 0; - this.field1374 = new float[VorbisSample_blockSize1]; + this.field1388 = 0; + this.field1380 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field1373 = 0; - this.field1344 = 0; + this.field1401 = 0; + this.field1402 = 0; } - for (; this.field1344 < this.field1359.length; ++this.field1344) { + for (; this.field1402 < this.field1381.length; ++this.field1402) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method2425(this.field1344); + float[] var2 = this.method2494(this.field1402); if (var2 != null) { - int var3 = this.field1373; + int var3 = this.field1401; 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.field1373; + var1[0] -= var3 - this.field1401; } - this.field1373 = var3; + this.field1401 = var3; } } - this.field1374 = null; + this.field1380 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1346); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1387); } } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("t") + @ObfuscatedName("m") @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("o") + @ObfuscatedName("k") @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("e") + @ObfuscatedName("d") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("g") - static void method2424(byte[] var0) { + @ObfuscatedName("v") + static void method2478(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1363 = new float[VorbisSample_blockSize1]; + field1391 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -546,22 +546,22 @@ public class VorbisSample extends Node { } int[] var14 = new int[var5]; - int var10 = CollisionMap.iLog(var5 - 1); + int var10 = PacketBufferNode.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = Widget.method4119(var11, var10); + var14[var11] = VarpDefinition.method4453(var11, var10); } if (var1 != 0) { - field1367 = var6; - field1368 = var12; - field1369 = var13; - field1371 = var14; + field1395 = var6; + field1396 = var12; + field1397 = var13; + field1369 = var14; } else { - field1364 = var6; - field1341 = var12; - field1357 = var13; - field1370 = var14; + field1392 = var6; + field1393 = var12; + field1377 = var13; + field1398 = var14; } } @@ -612,31 +612,31 @@ public class VorbisSample extends Node { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lii;)Z" + signature = "(Liy;)Z" ) - static boolean method2450(AbstractArchive var0) { - if (!field1362) { + static boolean method2474(AbstractArchive var0) { + if (!field1386) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2424(var1); - field1362 = true; + method2478(var1); + field1386 = true; } return true; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lii;II)Lcj;" + signature = "(Liy;II)Ldl;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2450(var0)) { + if (!method2474(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 1315ad0981..3ccedbc68e 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -3,74 +3,73 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("en") +@ObfuscatedName("ez") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1358140077 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 915149021 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1541741189 + intValue = -1214014955 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -696517801 + intValue = -166681381 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1454515853 + ) + @Export("x") + int x; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -985506123 ) @Export("orientation") int orientation; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 748186775 + intValue = 817578233 ) @Export("orientation2") int orientation2; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1886905411 + intValue = 1515780955 ) @Export("xOffset") int xOffset; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -275876635 + intValue = -102361683 ) @Export("yOffset") int yOffset; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lee;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 1621741553403153851L + longValue = -7258048285485333861L ) @Export("tag") public long tag; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -183294239 + intValue = 1418566089 ) @Export("flags") int flags; @@ -80,64 +79,61 @@ public final class WallDecoration { this.flags = 0; } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/String;", - garbageValue = "267409657" + signature = "(I[BLlq;S)V", + garbageValue = "4729" ) - public static String method3356(Buffer var0) { - return method3358(var0, 32767); - } + 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); + } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lkp;II)Ljava/lang/String;", - garbageValue = "149938652" - ) - static String method3358(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); - if (var2 > var1) { - var2 = var1; + 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); } - byte[] var3 = new byte[var2]; - var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = ScriptFrame.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; + ArchiveDiskActionHandler.field3151 = 600; } } - @ObfuscatedName("j") + @ObfuscatedName("iw") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "777331787" + signature = "(Ljava/lang/String;Lhe;I)Ljava/lang/String;", + garbageValue = "-748115662" ) - public static void method3359() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); - } + 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; + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "2015482933" - ) - static int method3357(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - class320.Interpreter_intStackSize -= 3; - AbstractWorldMapIcon.queueSoundEffect(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - BufferedSink.playSong(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - class320.Interpreter_intStackSize -= 2; - class49.playSoundJingle(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; + 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); + } + } } + + return var0; } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index fb5d1fede8..6e42af08ae 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -3,680 +3,702 @@ 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("hn") +@ObfuscatedName("he") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leh;" + signature = "[[Lhe;" ) - @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("z") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" + ) + @Export("Widget_cachedSprites") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Leg;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("x") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("k") - public static boolean field2697; - @ObfuscatedName("q") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("i") + public static boolean field2565; + @ObfuscatedName("a") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 966798893 + intValue = -957641141 ) @Export("id") public int id; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -637939151 + intValue = -611900971 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1589308129 + intValue = -802488779 ) @Export("type") public int type; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -480153267 + intValue = -248776571 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1797201679 + intValue = 1856343159 ) @Export("contentType") public int contentType; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 488943743 + intValue = -1508256889 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 77257793 + intValue = 286003577 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1510245031 + intValue = -1131410983 ) @Export("widthAlignment") public int widthAlignment; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1453424457 + intValue = 357993753 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -817220413 + intValue = -1997338621 ) @Export("rawX") public int rawX; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1957231607 + intValue = -1586734249 ) @Export("rawY") public int rawY; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 298003119 + intValue = -1225404085 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -270154123 + intValue = -568238685 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 2093770327 + intValue = 893339967 ) @Export("x") public int x; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -227555657 + intValue = -426365475 ) @Export("y") public int y; - @ObfuscatedName("aa") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1253665371 + intValue = -1065823023 ) @Export("width") public int width; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -476310133 + intValue = 379197055 ) @Export("height") public int height; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -605973757 + intValue = 162401447 ) - public int field2589; - @ObfuscatedName("ak") + public int field2584; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 955244305 + intValue = 1885155777 ) - public int field2590; - @ObfuscatedName("ac") + public int field2585; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1653380789 + intValue = 1237608307 ) @Export("parentId") public int parentId; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 536473649 + intValue = 615773905 ) @Export("scrollX") public int scrollX; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -612088835 + intValue = 1171290753 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 559224257 + intValue = 108625295 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -193403105 + intValue = 1982360223 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1950193909 + intValue = 1176894453 ) @Export("color") public int color; - @ObfuscatedName("ao") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -518404755 + intValue = 306036279 ) @Export("color2") public int color2; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 277012843 + intValue = 466751965 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 699027547 + intValue = 1324656195 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ag") + @ObfuscatedName("ad") @Export("fill") public boolean fill; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Llf;" + signature = "Llu;" ) @Export("fillMode") - public FillMode fillMode; - @ObfuscatedName("ab") + public class332 fillMode; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2036464857 + intValue = 14590311 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1652123329 + intValue = 974116043 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -74460937 + intValue = 2009428193 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bq") - public boolean field2606; @ObfuscatedName("bf") + public boolean field2601; + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1818205057 + intValue = 66057751 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bc") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1993820815 + intValue = -1011748949 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bk") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 2121453977 + intValue = -911208959 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bb") + @ObfuscatedName("bk") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bi") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 254544941 + intValue = -551996645 ) @Export("outline") public int outline; - @ObfuscatedName("bp") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -360859493 + intValue = 898417273 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("by") + @ObfuscatedName("bt") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1914949917 + intValue = -1679439917 ) @Export("modelType") public int modelType; - @ObfuscatedName("bw") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1077227953 + intValue = 483051319 ) @Export("modelId") public int modelId; - @ObfuscatedName("bt") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1140271877 + intValue = 125406963 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 2003629181 + intValue = 1734767957 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bm") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -240596143 + intValue = -166910705 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("ba") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1235474681 + intValue = -389521949 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -940655057 + intValue = 1269071469 ) @Export("modelOffsetX") public int modelOffsetX; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1529824909 + intValue = -924975785 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 2062525789 + intValue = -1358169901 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bh") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1899528959 + intValue = 283299325 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -844495371 + intValue = 1945900441 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bz") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -950068119 + intValue = -1346742871 ) @Export("modelZoom") public int modelZoom; + @ObfuscatedName("by") + @ObfuscatedGetter( + intValue = -1413539479 + ) + public int field2622; @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 291649371 + intValue = 1706662487 ) - public int field2627; - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = -233029925 - ) - public int field2696; - @ObfuscatedName("bv") + public int field2623; + @ObfuscatedName("bi") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bo") + @ObfuscatedName("bl") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("br") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -55381355 + intValue = 1321908019 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cp") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 364892773 + intValue = -1118352365 ) @Export("fontId") public int fontId; - @ObfuscatedName("cg") + @ObfuscatedName("cc") @Export("text") public String text; - @ObfuscatedName("cr") + @ObfuscatedName("ch") @Export("text2") public String text2; - @ObfuscatedName("co") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 252801441 + intValue = -1838623877 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ck") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 17386837 + intValue = -1124877935 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cn") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1637258997 + intValue = 1212909225 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cd") + @ObfuscatedName("cm") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("ct") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1431326299 + intValue = 99927781 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cb") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -174543693 + intValue = -534420979 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cf") + @ObfuscatedName("cg") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cm") + @ObfuscatedName("cd") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cz") + @ObfuscatedName("cx") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cu") + @ObfuscatedName("cn") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cy") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1317072949 + intValue = 1025348499 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("ce") - public boolean field2646; - @ObfuscatedName("cw") - public byte[][] field2702; - @ObfuscatedName("cq") - public byte[][] field2648; - @ObfuscatedName("ch") - public int[] field2649; - @ObfuscatedName("cx") - public int[] field2560; - @ObfuscatedName("dm") + @ObfuscatedName("cz") + public boolean field2641; + @ObfuscatedName("cb") + public byte[][] field2555; + @ObfuscatedName("cy") + public byte[][] field2643; + @ObfuscatedName("cj") + public int[] field2644; + @ObfuscatedName("cp") + public int[] field2695; + @ObfuscatedName("dv") @Export("dataText") public String dataText; - @ObfuscatedName("dw") + @ObfuscatedName("dd") @Export("actions") public String[] actions; - @ObfuscatedName("ds") + @ObfuscatedName("du") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhe;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dl") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 185265687 + intValue = -1434163873 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dv") + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = -1309236317 + intValue = -1149387947 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("do") + @ObfuscatedName("dq") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("di") + @ObfuscatedName("dj") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dc") + @ObfuscatedName("dl") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dj") + @ObfuscatedName("dm") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("de") + @ObfuscatedName("db") @Export("onClick") public Object[] onClick; - @ObfuscatedName("df") + @ObfuscatedName("dw") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dn") + @ObfuscatedName("de") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dy") + @ObfuscatedName("dh") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dq") + @ObfuscatedName("dk") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dd") + @ObfuscatedName("da") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dr") + @ObfuscatedName("do") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dk") + @ObfuscatedName("dr") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dg") + @ObfuscatedName("dx") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dt") + @ObfuscatedName("dy") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("du") + @ObfuscatedName("dc") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("db") + @ObfuscatedName("ds") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dh") + @ObfuscatedName("dt") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dz") + @ObfuscatedName("dp") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dx") + @ObfuscatedName("df") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("da") + @ObfuscatedName("di") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dp") + @ObfuscatedName("dn") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ey") + @ObfuscatedName("ea") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ee") + @ObfuscatedName("ex") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ec") + @ObfuscatedName("eo") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("em") + @ObfuscatedName("et") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("el") + @ObfuscatedName("eh") @Export("onKey") public Object[] onKey; @ObfuscatedName("eq") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("eu") + @ObfuscatedName("el") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("et") + @ObfuscatedName("ei") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("es") + @ObfuscatedName("en") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ep") + @ObfuscatedName("ec") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("er") + @ObfuscatedName("ev") @Export("onResize") public Object[] onResize; - @ObfuscatedName("en") + @ObfuscatedName("eb") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("ea") - public Object[] field2674; - @ObfuscatedName("ei") + @ObfuscatedName("ej") + public Object[] field2691; + @ObfuscatedName("ed") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("eg") + @ObfuscatedName("ee") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("eh") + @ObfuscatedName("ep") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ev") + @ObfuscatedName("er") @ObfuscatedGetter( - intValue = -855026753 + intValue = 58254591 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("eb") + @ObfuscatedName("ef") @Export("spellName") public String spellName; - @ObfuscatedName("ef") + @ObfuscatedName("eu") @Export("buttonText") public String buttonText; - @ObfuscatedName("ek") + @ObfuscatedName("em") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ej") + @ObfuscatedName("ez") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ez") + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = 145382301 + intValue = -1761852993 ) @Export("itemId") public int itemId; - @ObfuscatedName("eo") + @ObfuscatedName("ey") @ObfuscatedGetter( - intValue = -833257617 + intValue = 612667463 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ex") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = 835608255 + intValue = 1022717263 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ew") + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = -925535589 + intValue = -1039552423 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ed") + @ObfuscatedName("es") @ObfuscatedSignature( - signature = "[Lhn;" + signature = "[Lhe;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fl") + @ObfuscatedName("fk") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fp") + @ObfuscatedName("fw") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fx") + @ObfuscatedName("fl") @ObfuscatedGetter( - intValue = -1014136325 + intValue = -1024561307 ) - public int field2705; - @ObfuscatedName("fs") + public int field2700; + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = 2094586807 + intValue = 1220339105 ) - public int field2706; - @ObfuscatedName("fn") + public int field2701; + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = -1366369507 + intValue = -524679265 ) - public int field2570; - @ObfuscatedName("fh") + public int field2620; + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = -668838765 + intValue = -1480837579 ) - public int field2708; - @ObfuscatedName("fb") + public int field2588; + @ObfuscatedName("fo") @ObfuscatedGetter( - intValue = 604114463 + intValue = -612332201 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fz") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -1831666503 + intValue = 847308047 ) @Export("cycle") public int cycle; - @ObfuscatedName("fj") - public int[] field2711; - @ObfuscatedName("fw") + @ObfuscatedName("fv") + public int[] field2706; + @ObfuscatedName("fc") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("ff") + @ObfuscatedName("fp") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fm") - public boolean field2713; + @ObfuscatedName("fg") + public boolean field2658; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2697 = false; + field2565 = false; } public Widget() { @@ -697,8 +719,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2589 = 1; - this.field2590 = 1; + this.field2584 = 1; + this.field2585 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -710,11 +732,11 @@ public class Widget extends Node { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.fillMode = FillMode.SOLID; + this.fillMode = class332.SOLID; this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2606 = false; + this.field2601 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -733,8 +755,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2627 = 0; - this.field2696 = 0; + this.field2622 = 0; + this.field2623 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -748,7 +770,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2646 = false; + this.field2641 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -765,21 +787,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2705 = -1; - this.field2706 = 0; - this.field2570 = 0; - this.field2708 = 0; + this.field2700 = -1; + this.field2701 = 0; + this.field2620 = 0; + this.field2588 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2713 = false; + this.field2658 = false; } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-1287824768" + signature = "(Lkb;B)V", + garbageValue = "-113" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -847,8 +869,8 @@ public class Widget extends Node { } if (this.type == 2) { - this.itemIds = new int[this.rawHeight * this.rawWidth]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; var4 = var1.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 268435456; @@ -963,8 +985,8 @@ public class Widget extends Node { } if (this.type == 7) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.itemIds = new int[this.rawHeight * this.rawWidth]; + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { @@ -1033,10 +1055,10 @@ public class Widget extends Node { } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "2093742106" + signature = "(Lkb;I)V", + garbageValue = "1292756714" ) @Export("decode") void decode(Buffer var1) { @@ -1103,7 +1125,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2627 = var1.readUnsignedShort(); + this.field2622 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1134,7 +1156,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2606 = var1.readUnsignedByte() == 1; + this.field2601 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1175,10 +1197,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lkp;I)[Ljava/lang/Object;", - garbageValue = "2009798278" + signature = "(Lkb;I)[Ljava/lang/Object;", + garbageValue = "2142536544" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1202,10 +1224,10 @@ public class Widget extends Node { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkp;I)[I", - garbageValue = "1361123043" + signature = "(Lkb;I)[I", + garbageValue = "-1956943483" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1223,10 +1245,10 @@ public class Widget extends Node { } } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-16" + signature = "(III)V", + garbageValue = "880946996" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1238,14 +1260,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ZB)Llt;", - garbageValue = "50" + signature = "(ZB)Lla;", + garbageValue = "-39" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2697 = false; + field2565 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1256,14 +1278,14 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); if (var5 != null) { return var5; } else { - var5 = WorldMapSection1.SpriteBuffer_getSprite(Username.Widget_spritesArchive, var2, 0); + var5 = MusicPatchNode2.SpriteBuffer_getSprite(Varps.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2697 = true; + field2565 = true; return null; } else { if (this.spriteFlipV) { @@ -1297,14 +1319,14 @@ public class Widget extends Node { } } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lko;", - garbageValue = "-700257512" + signature = "(B)Lkx;", + garbageValue = "-18" ) @Export("getFont") public Font getFont() { - field2697 = false; + field2565 = false; if (this.fontId == -1) { return null; } else { @@ -1312,26 +1334,35 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = FaceNormal.method3335(Username.Widget_spritesArchive, class162.Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = Varps.Widget_spritesArchive; + AbstractArchive var4 = Widget_fontsArchive; + int var5 = this.fontId; + Font var2; + if (!UserComparator7.method3516(var3, var5, 0)) { + var2 = null; } else { - field2697 = true; + var2 = VertexNormal.method3094(var4.takeFile(var5, 0)); } - return var1; + if (var2 != null) { + Widget_cachedFonts.put(var2, (long)this.fontId); + } else { + field2565 = true; + } + + return var2; } } } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)Llt;", - garbageValue = "610412077" + signature = "(IB)Lla;", + garbageValue = "14" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2697 = false; + field2565 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1341,11 +1372,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = WorldMapSection1.SpriteBuffer_getSprite(Username.Widget_spritesArchive, var2, 0); + var3 = MusicPatchNode2.SpriteBuffer_getSprite(Varps.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2697 = true; + field2565 = true; } return var3; @@ -1356,14 +1387,14 @@ public class Widget extends Node { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lip;IZLhp;I)Ldx;", - garbageValue = "-1566575380" + signature = "(Ljc;IZLhk;B)Lel;", + garbageValue = "73" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2697 = false; + field2565 = false; int var5; int var6; if (var3) { @@ -1383,9 +1414,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(Calendar.Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(SoundSystem.Widget_modelsArchive, var6, 0); if (var8 == null) { - field2697 = true; + field2565 = true; return null; } @@ -1393,9 +1424,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = NetCache.getNpcDefinition(var6).getModelData(); + var8 = class237.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2697 = true; + field2565 = true; return null; } @@ -1409,7 +1440,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2697 = true; + field2565 = true; return null; } @@ -1417,10 +1448,10 @@ public class Widget extends Node { } if (var5 == 4) { - ItemDefinition var9 = HealthBarDefinition.ItemDefinition_get(var6); + ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2697 = true; + field2565 = true; return null; } @@ -1438,10 +1469,10 @@ public class Widget extends Node { } } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(ZI)Lhf;", - garbageValue = "-1393385488" + signature = "(ZB)Lhg;", + garbageValue = "-84" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1449,11 +1480,11 @@ public class Widget extends Node { var1 = false; } - int var2 = var1 ? this.spriteId : this.spriteId2; + int var2 = var1 ? this.spriteId * -1011748949 * -1444834557 : this.spriteId2 * -2111921753 * 66057751; if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); + long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1497,10 +1528,10 @@ public class Widget extends Node { } } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)V", - garbageValue = "121" + signature = "(ILjava/lang/String;I)V", + garbageValue = "-207986115" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1518,18 +1549,366 @@ public class Widget extends Node { this.actions[var1] = var2; } - @ObfuscatedName("e") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-855485303" + signature = "(ILce;ZI)I", + garbageValue = "1024781244" ) - public static int method4119(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; - } + 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 var2; + return 1; + } 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] = class51.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; + } + } + } + } + } } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 51d06a88db..576f46a3f7 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("ch") @Implements("World") public class World { - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1866587551 + intValue = 1328454415 ) @Export("World_count") static int World_count; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1158665881 + intValue = 89189373 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Leg;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1411281577 + intValue = 1023289861 ) @Export("id") int id; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2119129825 + intValue = -522510299 ) @Export("properties") int properties; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2120621835 + intValue = -1229908449 ) @Export("population") int population; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("host") String host; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("activity") String activity; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1248235399 + intValue = -1299711201 ) @Export("location") int location; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1361119187 + intValue = -281997857 ) @Export("index") int index; @@ -78,200 +72,147 @@ public class World { World() { } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "1" + garbageValue = "-87" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "36" + signature = "(I)Z", + garbageValue = "-1374980076" ) - boolean method1760() { + boolean method1869() { return (2 & this.properties) != 0; } - @ObfuscatedName("h") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-764508558" + garbageValue = "-1915504932" ) @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1545787389" + signature = "(B)Z", + garbageValue = "53" ) - boolean method1787() { + boolean method1871() { return (8 & this.properties) != 0; } @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "1" + signature = "(I)Z", + garbageValue = "248561667" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1183174451" + garbageValue = "-1399101886" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("w") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1307940370" + signature = "(B)Z", + garbageValue = "20" ) - boolean method1767() { + boolean method1879() { return (1073741824 & this.properties) != 0; } - @ObfuscatedName("t") - static final void method1801(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { - } - + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Liy;Liy;Liy;Liy;S)V", + garbageValue = "-3755" + ) + 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()]; } - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IILfk;Lfv;I)Z", - garbageValue = "-186074271" + signature = "(CB)Z", + garbageValue = "34" ) - public static final boolean method1770(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class173.directions[var6][var7] = 99; - class173.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class173.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class173.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var18 != var11) { - var4 = class173.bufferX[var11]; - var5 = class173.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(2, var4, var5, var3)) { - ChatChannel.field1289 = var4; - class173.field2093 = var5; - return true; - } - - int var15 = class173.distances[var16][var17] + 1; - if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17] = 2; - class173.distances[var16 - 1][var17] = var15; - } - - if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17] = 8; - class173.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 - 1] = 1; - class173.distances[var16][var17 - 1] = var15; - } - - if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 + 1] = 4; - class173.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 - 1] = 3; - class173.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 126 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 - 1] = 9; - class173.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 126 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 + 1] = 6; - class173.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 126 && var17 < 126 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 + 1] = 12; - class173.distances[var16 + 1][var17 + 1] = var15; - } - } - - ChatChannel.field1289 = var4; - class173.field2093 = var5; - return false; + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } - @ObfuscatedName("n") + @ObfuscatedName("ht") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1273195728" + signature = "(III)V", + garbageValue = "-1848249905" ) - static void method1762() { - if (UserComparator8.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } + @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; + 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); + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + GrandExchangeOfferWorldComparator.scene.removeGroundItemPile(ScriptEvent.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 (var12.id != var6.id && var11 == null) { + var11 = var6; + } + } + } + + 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); + } + } } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 05860ddd98..deabc7dd7b 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("ly") +@ObfuscatedName("ml") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lka;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lko;" + signature = "Lkx;" ) @Export("font") Font font; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("fonts") HashMap fonts; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lli;" + signature = "[Lle;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("w") + @ObfuscatedName("g") @Export("details") HashMap details; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lae;" + signature = "Las;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lae;" + signature = "Las;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lae;" + signature = "Las;" ) - WorldMapArea field3960; - @ObfuscatedName("y") + WorldMapArea field3984; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lak;" + signature = "Laj;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lmi;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1749919679 + intValue = -1156713059 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1342348205 + intValue = 1112780801 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1704242359 + intValue = 1961416767 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 492760155 + intValue = 291588009 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("u") + @ObfuscatedName("f") @Export("zoom") float zoom; @ObfuscatedName("ae") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 945465343 + intValue = 2108230877 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1711866961 + intValue = 835636901 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1490885125 + intValue = 982152301 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("aj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 203528323 + intValue = 2052237249 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -762865251 + intValue = -1593055275 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 770268231 + intValue = 1055110607 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("aa") + @ObfuscatedName("at") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("flashingElements") HashSet flashingElements; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 674929495 + intValue = 1658498297 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ak") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -981605543 + intValue = -818253269 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -240935151 + intValue = 2062517591 ) - int field3979; - @ObfuscatedName("aw") + int field4003; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 650254011 + intValue = -582417353 ) - int field3982; - @ObfuscatedName("ar") + int field4004; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 757767451 + intValue = -1399744773 ) - int field3977; + int field3970; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1272678139 + intValue = 1747511571 ) - int field3951; - @ObfuscatedName("al") + int field4022; + @ObfuscatedName("ak") @ObfuscatedGetter( - longValue = 5380026643916633153L + longValue = -7492465693749449203L ) - long field3967; + long field4007; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 1948821495 + ) + int field4008; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = 785384757 + ) + int field4023; + @ObfuscatedName("az") + boolean field3993; @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 950213411 - ) - int field3984; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1648273559 - ) - int field3969; - @ObfuscatedName("ao") - boolean field3986; - @ObfuscatedName("ag") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ai") + @ObfuscatedName("ac") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ap") - HashSet field3991; - @ObfuscatedName("ah") + @ObfuscatedName("ag") + HashSet field3997; + @ObfuscatedName("aw") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bq") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1735294353 + intValue = -754982927 ) - int field3981; - @ObfuscatedName("bc") + int field4016; + @ObfuscatedName("bo") @Export("menuOpcodes") final int[] menuOpcodes; + @ObfuscatedName("bd") + List field4018; @ObfuscatedName("bk") - List field3995; - @ObfuscatedName("bb") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bi") - HashSet field3997; - @ObfuscatedName("bp") + @ObfuscatedName("bu") + HashSet field4019; + @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lhj;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bl") + @ObfuscatedName("bg") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("by") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Llt;" + signature = "Lla;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("be") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1384358413 + intValue = -1704097389 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bw") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1781840663 + intValue = -1222435813 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bt") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1423775659 + intValue = 1773937531 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1004367461 + intValue = 1017317495 ) - int field3959; + int field3999; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field3979 = -1; - this.field3982 = -1; - this.field3977 = -1; - this.field3951 = -1; - this.field3986 = true; + this.field4003 = -1; + this.field4004 = -1; + this.field3970 = -1; + this.field4022 = -1; + this.field3993 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field3991 = new HashSet(); - this.elementsDisabled = false; - this.field3981 = 0; - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; this.field3997 = new HashSet(); + this.elementsDisabled = false; + this.field4016 = 0; + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; + this.field4019 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field3959 = -1; + this.field3999 = -1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;Lii;Lii;Lko;Ljava/util/HashMap;[Lli;B)V", - garbageValue = "50" + signature = "(Liy;Liy;Liy;Lkx;Ljava/util/HashMap;[Lle;I)V", + garbageValue = "-1632082744" ) @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.field313.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field339.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); - this.field3960 = null; + this.field3984 = null; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-449283348" + garbageValue = "902859893" ) - public void method6499() { + public void method6509() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIZIIIIB)V", - garbageValue = "-1" + signature = "(IIZIIIII)V", + garbageValue = "-1392973406" ) @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.method643(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.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); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class4.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); GrandExchangeOfferOwnWorldComparator.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.field3997.contains(var13)) { + if (this.field4019.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field3997.iterator(); + var12 = this.field4019.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -410,72 +410,72 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - class4.runScriptEvent(var14); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var14); } } - this.field3997 = var11; + this.field4019 = var11; } } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIZZB)V", - garbageValue = "3" + signature = "(IIZZI)V", + garbageValue = "2122785833" ) - public void method6363(int var1, int var2, boolean var3, boolean var4) { - long var5 = WorldMapIcon_0.currentTimeMillis(); - this.method6454(var1, var2, var4, var5); + public void method6420(int var1, int var2, boolean var3, boolean var4) { + long var5 = class217.currentTimeMillis(); + this.method6487(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { if (var4) { - this.field3977 = var1; - this.field3951 = var2; - this.field3979 = this.centerTileX; - this.field3982 = this.centerTileY; + this.field3970 = var1; + this.field4022 = var2; + this.field4003 = this.centerTileX; + this.field4004 = this.centerTileY; } - if (this.field3979 != -1) { - int var7 = var1 - this.field3977; - int var8 = var2 - this.field3951; - this.setWorldMapPosition(this.field3979 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3982, false); + 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); } } else { - this.method6368(); + this.method6425(); } if (var4) { - this.field3967 = var5; - this.field3984 = var1; - this.field3969 = var2; + this.field4007 = var5; + this.field4008 = var1; + this.field4023 = var2; } } - @ObfuscatedName("i") - void method6454(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("w") + void method6487(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 (FloorOverlayDefinition.method4835() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - WorldMapRegion.method563(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + if (FaceNormal.method3379() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + GrandExchangeOfferWorldComparator.method148(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { boolean var8 = true; - if (this.field3986) { - int var9 = var1 - this.field3984; - int var10 = var2 - this.field3969; - if (var4 - this.field3967 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { + 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; } } if (var8) { - PacketBufferNode var11 = TilePaint.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); + PacketBufferNode var11 = FaceNormal.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); var11.packetBuffer.writeInt(this.mouseCoord.packed()); Client.packetWriter.addNode(var11); - this.field3967 = 0L; + this.field4007 = 0L; } } } @@ -485,18 +485,18 @@ public class WorldMap { } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2064415632" + signature = "(B)V", + garbageValue = "22" ) @Export("smoothZoom") void smoothZoom() { - if (class218.field2716 != null) { + if (WorldMapRectangle.field222 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); } if (this.zoom > this.zoomTarget) { @@ -506,10 +506,10 @@ public class WorldMap { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "4" + signature = "(I)V", + garbageValue = "819469805" ) @Export("scrollToTarget") void scrollToTarget() { @@ -533,48 +533,48 @@ public class WorldMap { } } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(IIZI)V", - garbageValue = "-1067746846" + garbageValue = "353769390" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - WorldMapIcon_0.currentTimeMillis(); + class217.currentTimeMillis(); if (var3) { - this.method6368(); + this.method6425(); } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1954951497" + signature = "(B)V", + garbageValue = "32" ) - final void method6368() { - this.field3951 = -1; - this.field3977 = -1; - this.field3982 = -1; - this.field3979 = -1; + final void method6425() { + this.field4022 = -1; + this.field3970 = -1; + this.field4004 = -1; + this.field4003 = -1; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "53671809" + garbageValue = "408108894" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIII)Lae;", - garbageValue = "1541741189" + signature = "(IIII)Las;", + garbageValue = "1867716364" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -592,12 +592,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIIZI)V", - garbageValue = "508840243" + garbageValue = "1519014469" ) - public void method6371(int var1, int var2, int var3, boolean var4) { + public void method6524(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -608,8 +608,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field3960 || var4) { - this.field3960 = var5; + if (var5 != this.field3984 || var4) { + this.field3984 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -620,10 +620,10 @@ public class WorldMap { } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1319547815" + garbageValue = "-513513568" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -634,30 +634,30 @@ public class WorldMap { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-125" + signature = "(I)I", + garbageValue = "583895693" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)Lae;", - garbageValue = "255797154" + signature = "(I)Las;", + garbageValue = "683414686" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "808158376" + signature = "(Las;B)V", + garbageValue = "-18" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -667,10 +667,10 @@ public class WorldMap { } } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1342819699" + signature = "(Las;I)V", + garbageValue = "-1810722368" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -679,12 +679,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lae;Lhj;Lhj;ZS)V", - garbageValue = "256" + signature = "(Las;Lhj;Lhj;ZI)V", + garbageValue = "698052085" ) - public void method6377(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6588(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -699,10 +699,10 @@ public class WorldMap { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIIB)V", - garbageValue = "17" + garbageValue = "86" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -717,16 +717,16 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field3995 = null; + this.field4018 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-1497062922" + signature = "(IIIIIB)V", + garbageValue = "0" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -762,16 +762,16 @@ public class WorldMap { this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); if (!this.elementsDisabled) { boolean var10 = false; - if (var5 - this.field3981 > 100) { - this.field3981 = var5; + 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.field3991, 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.field3997, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6381(var1, var2, var3, var4, var8, var9); - if (FloorOverlayDefinition.method4835() && this.showCoord && this.mouseCoord != null) { + this.method6426(var1, var2, var3, var4, var8, var9); + if (FaceNormal.method3379() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -783,18 +783,18 @@ public class WorldMap { } } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "1871269432" + garbageValue = "-1422166631" ) - boolean method6380(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6437(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.field3959 != Client.field888) { + } else if (this.field3999 != Client.field891) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -806,13 +806,13 @@ public class WorldMap { } } - @ObfuscatedName("u") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "-1868764564" + signature = "(IIIIIIB)V", + garbageValue = "8" ) - void method6381(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class218.field2716 != null) { + void method6426(int var1, int var2, int var3, int var4, int var5, int var6) { + if (WorldMapRectangle.field222 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -823,7 +823,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.method6380(var8, var9, var13, var14, var3, var4)) { + if (this.method6437(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 +833,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - class218.field2716.method4404(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field3959 = Client.field888; - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + WorldMapRectangle.field222.method4407(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field3999 = Client.field891; + 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 (1.0F == var10) { - this.sprite.method6201(var13, var14, 192); + if (var10 == 1.0F) { + this.sprite.method6234(var13, var14, 192); } else { - this.sprite.method6280(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); + this.sprite.method6268(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); } } } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "864377578" + signature = "(IIIIB)V", + garbageValue = "-54" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -868,20 +868,20 @@ public class WorldMap { } } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "23" + signature = "(II)V", + garbageValue = "1466740410" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(IIIIII)V", - garbageValue = "-1694224866" + garbageValue = "1603223574" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -894,10 +894,10 @@ public class WorldMap { this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("ax") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(IB)F", - garbageValue = "-6" + signature = "(II)F", + garbageValue = "132963455" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -914,50 +914,50 @@ public class WorldMap { } } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1982956144" + garbageValue = "600440321" ) @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { + if ((double)this.zoomTarget == 1.0D) { return 25; - } else if ((double)this.zoomTarget == 1.5D) { + } else if (1.5D == (double)this.zoomTarget) { return 37; - } else if (2.0D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 2.0D) { return 50; - } else if ((double)this.zoomTarget == 3.0D) { + } else if (3.0D == (double)this.zoomTarget) { return 75; } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; + return (double)this.zoomTarget == 4.0D ? 100 : 200; } } - @ObfuscatedName("au") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-15" + signature = "(I)V", + garbageValue = "-182915585" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("ay") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "62" + signature = "(I)Z", + garbageValue = "-1191452508" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("aa") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(II)Lae;", - garbageValue = "-583090673" + signature = "(II)Las;", + garbageValue = "-982696781" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -975,10 +975,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("aq") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1378378704" + garbageValue = "441252120" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -988,10 +988,10 @@ public class WorldMap { } } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1855899067" + signature = "(IIB)V", + garbageValue = "103" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1002,10 +1002,10 @@ public class WorldMap { } } - @ObfuscatedName("ak") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "100238164" + garbageValue = "991204183" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1018,10 +1018,10 @@ public class WorldMap { } } - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(IIIB)V", - garbageValue = "-50" + garbageValue = "0" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1034,60 +1034,60 @@ public class WorldMap { } } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "429030075" + signature = "(B)I", + garbageValue = "-12" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1683387381" + garbageValue = "-1454836009" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("av") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(I)Lhj;", - garbageValue = "663930185" + signature = "(B)Lhj;", + garbageValue = "-24" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("al") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-261888637" + signature = "(B)I", + garbageValue = "-27" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "73" + signature = "(I)I", + garbageValue = "-165837872" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("am") + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "24" + garbageValue = "-4" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1097,20 +1097,20 @@ public class WorldMap { } - @ObfuscatedName("ao") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "80342748" + garbageValue = "-1765651870" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "30" + signature = "(II)V", + garbageValue = "-544500674" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1120,30 +1120,30 @@ public class WorldMap { } - @ObfuscatedName("an") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1876711649" + garbageValue = "1325127509" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ag") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-15" + signature = "(ZI)V", + garbageValue = "2030274031" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1016061625" + garbageValue = "-843738086" ) @Export("flashElement") public void flashElement(int var1) { @@ -1153,10 +1153,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("ab") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1555254761" + garbageValue = "2123087925" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1164,38 +1164,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < class218.WorldMapElement_count; ++var2) { - if (PacketBufferNode.WorldMapElement_get(var2) != null && PacketBufferNode.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(PacketBufferNode.WorldMapElement_get(var2).objectId); + 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); } } } - @ObfuscatedName("ap") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1842650742" + garbageValue = "2104531068" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("ah") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-18" + signature = "(ZI)V", + garbageValue = "560446249" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bq") + @ObfuscatedName("bo") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-486377130" + garbageValue = "-2066473112" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1205,13 +1205,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6413(); + this.method6511(); } - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-2134751202" + garbageValue = "741156816" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1221,9 +1221,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < class218.WorldMapElement_count; ++var3) { - if (PacketBufferNode.WorldMapElement_get(var3) != null && PacketBufferNode.WorldMapElement_get(var3).category == var1) { - int var4 = PacketBufferNode.WorldMapElement_get(var3).objectId; + 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; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1232,61 +1232,61 @@ public class WorldMap { } } - this.method6413(); + this.method6511(); } - @ObfuscatedName("bc") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-85" + signature = "(I)Z", + garbageValue = "149249835" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bk") + @ObfuscatedName("bu") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "1527323517" + garbageValue = "1744055471" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bb") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "73" + signature = "(IS)Z", + garbageValue = "-18946" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "118" + signature = "(I)V", + garbageValue = "105577872" ) - void method6413() { - this.field3991.clear(); - this.field3991.addAll(this.enabledElements); - this.field3991.addAll(this.enabledElementIds); + void method6511() { + this.field3997.clear(); + this.field3997.addAll(this.enabledElements); + this.field3997.addAll(this.enabledElementIds); } - @ObfuscatedName("bp") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "-1183696122" + signature = "(IIIIIIB)V", + garbageValue = "91" ) @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.method643(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.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); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1297,12 +1297,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = PacketBufferNode.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = class25.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - GraphicsObject.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + IgnoreList.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1312,12 +1312,12 @@ public class WorldMap { } } - @ObfuscatedName("bl") + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "(ILhj;B)Lhj;", - garbageValue = "-33" + garbageValue = "32" ) - public Coord method6411(int var1, Coord var2) { + public Coord method6470(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1358,10 +1358,10 @@ public class WorldMap { } } - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedSignature( signature = "(IILhj;Lhj;B)V", - garbageValue = "-47" + garbageValue = "35" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1385,13 +1385,13 @@ public class WorldMap { var5.setType(14); } - class4.runScriptEvent(var5); + GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); } - @ObfuscatedName("be") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(I)Laq;", - garbageValue = "-2025058751" + signature = "(I)Lax;", + garbageValue = "-295029476" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1401,23 +1401,23 @@ public class WorldMap { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field3995 = new LinkedList(); + this.field4018 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field3995.addAll(var3); + this.field4018.addAll(var3); } - this.iconIterator = this.field3995.iterator(); + this.iconIterator = this.field4018.iterator(); return this.iconNext(); } } - @ObfuscatedName("bw") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(I)Laq;", - garbageValue = "483386340" + signature = "(I)Lax;", + garbageValue = "-528069180" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index a51789887c..b5717d0e3c 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("mi") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("i") + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Liv;" + ) + static StudioGame field3965; + @ObfuscatedName("w") @Export("cacheName") String cacheName; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1269889337 + intValue = 2095920673 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("loaded") boolean loaded; @ObfuscatedSignature( - signature = "(Lii;)V" + signature = "(Liy;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -35,10 +40,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "101" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-2004873028" ) @Export("reset") void reset(String var1) { @@ -52,15 +57,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2006696210" + garbageValue = "-1654768805" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field309.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field340.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +73,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field310.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field310.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field341.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field341.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +81,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field312.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field343.name)) { return this.percentLoaded; } @@ -87,20 +92,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1868224122" + signature = "(B)Z", + garbageValue = "30" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "170805497" + signature = "(B)I", + garbageValue = "16" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 53c172de10..087068699e 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,3 +1,4 @@ +import java.awt.Image; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -6,67 +7,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("as") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("c") + @ObfuscatedName("al") + static Image field265; + @ObfuscatedName("gn") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1410510983 + intValue = -631635031 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("internalName") String internalName; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("externalName") String externalName; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 925396111 + intValue = -46653521 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1226828671 + intValue = 1356940577 ) @Export("zoom") int zoom; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lhj;" ) @Export("origin") Coord origin; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -371722199 + intValue = 739572021 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 604865057 + intValue = -1052240037 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 274624123 + intValue = -1837208227 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1237300351 + intValue = -884560367 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("isMain") boolean isMain; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("sections") LinkedList sections; @@ -82,10 +88,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;II)V", - garbageValue = "-1829168908" + signature = "(Lkb;IB)V", + garbageValue = "9" ) @Export("read") public void read(Buffer var1, int var2) { @@ -107,28 +113,28 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)Lac;", - garbageValue = "933484364" + signature = "(Lkb;I)Lay;", + garbageValue = "647857344" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)WorldMapSection0.findEnumerated(WorldMapSectionType.method249(), var2); + WorldMapSectionType var3 = (WorldMapSectionType)GrandExchangeEvent.findEnumerated(WorldMapSectionType.method345(), var2); Object var4 = null; switch(var3.type) { case 0: - var4 = new WorldMapSection2(); + var4 = new WorldMapSection0(); break; case 1: - var4 = new class42(); + var4 = new class51(); break; case 2: var4 = new WorldMapSection1(); break; case 3: - var4 = new WorldMapSection0(); + var4 = new WorldMapSection2(); break; default: throw new IllegalStateException(""); @@ -138,10 +144,10 @@ public class WorldMapArea { return (WorldMapSection)var4; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "1328516343" + signature = "(IIIB)Z", + garbageValue = "-47" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -159,10 +165,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-2019435161" + garbageValue = "-541055130" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -190,10 +196,10 @@ public class WorldMapArea { } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)[I", - garbageValue = "371604426" + signature = "(IIIB)[I", + garbageValue = "-62" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -211,10 +217,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-2147059798" + signature = "(IIB)Lhj;", + garbageValue = "-65" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -232,10 +238,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-263455981" + garbageValue = "969855429" ) @Export("setBounds") void setBounds() { @@ -248,264 +254,221 @@ public class WorldMapArea { } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-650960366" + signature = "(B)I", + garbageValue = "39" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "2024226786" + signature = "(B)Z", + garbageValue = "-126" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)Ljava/lang/String;", - garbageValue = "1" + garbageValue = "76" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "2136692647" + garbageValue = "1379257785" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "4" + garbageValue = "0" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "293375977" + garbageValue = "2036158074" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2073176457" + garbageValue = "1003198197" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-617672869" + garbageValue = "-1380383839" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "501195938" + garbageValue = "1596015720" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "536883045" + garbageValue = "851351546" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1345983642" + garbageValue = "-2108645613" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "12" + signature = "(I)I", + garbageValue = "567530142" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "622743388" + signature = "(B)I", + garbageValue = "-86" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Lhj;", - garbageValue = "-2050948360" + garbageValue = "710873415" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("t") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class289.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkp;IIIIIIS)V", - garbageValue = "4210" + signature = "(I)V", + garbageValue = "2135191334" ) - @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; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; - 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 = class3.method49(45365 + var11, 91923 + var12, 4) - 128 + (class3.method49(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class3.method49(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } + try { + var0 = KeyHandler.getPreferencesFile("", WorldMapArchiveLoader.field3965.name, true); + Buffer var1 = GrandExchangeOfferOwnWorldComparator.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } - 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) { - Tiles.field514[var1][var2][var3] = var0.readByte(); - Tiles.field507[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field518[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.field502[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(); - } + try { + if (var0 != null) { + var0.closeSync(true); } + } catch (Exception var2) { } } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "20" + signature = "(ILiy;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "350541226" ) - static final void method425() { - class60.method1188("Your friend list is full. Max of 200 for free users, and 400 for members"); + 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(); + } + } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 485f0a82ae..8d3df2ba7f 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -5,28 +5,33 @@ 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("aw") +@ObfuscatedName("ad") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("v") + @ObfuscatedName("hc") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("n") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("x") + @ObfuscatedName("h") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cg") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(Lkp;Lkp;IZS)V", - garbageValue = "-14333" + signature = "(Lkb;Lkb;IZI)V", + garbageValue = "-661163942" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -65,10 +70,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("cr") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(Lkp;ZI)V", - garbageValue = "-1209977249" + signature = "(Lkb;ZI)V", + garbageValue = "1078269638" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -76,7 +81,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5593(); + int var5 = var1.method5591(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -86,118 +91,49 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("e") + @ObfuscatedName("is") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "599780957" + signature = "(Lhe;IIZS)V", + garbageValue = "11869" ) - static int method706(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - class320.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = Varps.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) { - class186.field2331 = var12; - } else { - MidiPcmStream.field2444 = var12; - } - - NPCDefinition.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? class186.field2331 : MidiPcmStream.field2444; - Widget var10 = Varps.getWidget(var9.id); - var10.children[var9.childIndex] = null; - NPCDefinition.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - var9.children = null; - NPCDefinition.invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - if (var2) { - class186.field2331 = var9; - } else { - MidiPcmStream.field2444 = var9; - } - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - Widget var11 = SpriteMask.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - if (var2) { - class186.field2331 = var11; - } else { - MidiPcmStream.field2444 = var11; - } - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + @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.field2584 * var0.height / var0.field2585; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field2585 * var0.width / var0.field2584; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); } - } - @ObfuscatedName("ia") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1052520169" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = TilePaint.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeShortLE(var1); - var2.packetBuffer.writeInt(var0); - Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 6e1a3d4843..c07c8ed17d 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -2,315 +2,137 @@ 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("as") +@ObfuscatedName("az") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Las;" + signature = "Laz;" ) - public static final WorldMapCacheName field313; - @ObfuscatedName("t") + public static final WorldMapCacheName field339; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Las;" + signature = "Laz;" ) - public static final WorldMapCacheName field309; - @ObfuscatedName("o") + public static final WorldMapCacheName field340; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Las;" + signature = "Laz;" ) - public static final WorldMapCacheName field310; - @ObfuscatedName("e") + public static final WorldMapCacheName field341; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Las;" + signature = "Laz;" ) - static final WorldMapCacheName field311; - @ObfuscatedName("i") + static final WorldMapCacheName field345; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Las;" + signature = "Laz;" ) - public static final WorldMapCacheName field312; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lll;" - ) - static Bounds field315; - @ObfuscatedName("g") + public static final WorldMapCacheName field343; + @ObfuscatedName("aq") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("v") @Export("name") public final String name; static { - field313 = new WorldMapCacheName("details"); - field309 = new WorldMapCacheName("compositemap"); - field310 = new WorldMapCacheName("compositetexture"); - field311 = new WorldMapCacheName("area"); - field312 = new WorldMapCacheName("labels"); + field339 = new WorldMapCacheName("details"); + field340 = new WorldMapCacheName("compositemap"); + field341 = new WorldMapCacheName("compositetexture"); + field345 = new WorldMapCacheName("area"); + field343 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1252673540" + signature = "(Ljava/lang/CharSequence;B)[B", + garbageValue = "-93" ) - public static void method635() { - VarpDefinition.VarpDefinition_cached.clear(); - } + public static byte[] method715(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(I)Lbg;", - garbageValue = "-1273347213" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return DefaultsGroup.getNextWorldListWorld(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1459366503" - ) - static void method634() { - Login.loginIndex = 24; - Tiles.setLoginResponseString("", "You were disconnected from the server.", ""); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "8" - ) - static int method633(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator8.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = DefaultsGroup.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + 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 { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == class96.World_worlds[var5].id) { - var4 = class96.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - class320.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3] == 1; - WorldMapDecoration.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - class320.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var9 = PacketBufferNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = NetCache.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = NetCache.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - class320.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var9 = PacketBufferNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Occluder.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Occluder.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - class320.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var9 = PacketBufferNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - class320.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var9 = PacketBufferNode.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Fonts.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Fonts.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++class320.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) { - --Message.Interpreter_stringStackSize; - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --Message.Interpreter_stringStackSize; - --class320.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = class96.World_worlds[var7]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } + var2[var3] = 63; } } + + return var2; } - @ObfuscatedName("is") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1758289835" - ) - @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 " " + PacketWriter.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + PacketWriter.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + PacketWriter.colorStartTag(16776960) + var1 + ""; - } - } - - @ObfuscatedName("lj") + @ObfuscatedName("gh") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1011989365" + garbageValue = "-2140521670" ) - static void method636() { - if (Client.oculusOrbState == 1) { - Client.field728 = true; + static void method716() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class22.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 54b3ce4651..e92760eb3f 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -2,73 +2,65 @@ 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("w") +@ObfuscatedName("y") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("sk") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("fm") + @ObfuscatedName("y") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("br") + static String field137; + @ObfuscatedName("fh") @ObfuscatedSignature( - signature = "Lei;" + signature = "Lkx;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("fontPlain11") - static Font fontPlain11; + @Export("fontPlain12") + static Font fontPlain12; @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "[Llt;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; + @Export("regionLandArchives") + static byte[][] regionLandArchives; WorldMapData_0() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "-109" + signature = "(Lkb;I)V", + garbageValue = "-1716650970" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field277.value) { + if (var2 != WorldMapID.field302.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 64; + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5593(); - super.fileId = var1.method5593(); + super.groupId = var1.method5591(); + super.fileId = var1.method5591(); } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;S)V", - garbageValue = "-30591" + signature = "(Lkb;B)V", + garbageValue = "-78" ) @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.field188 = new byte[super.planes][64][64]; - super.field175 = new byte[super.planes][64][64]; + super.field205 = new byte[super.planes][64][64]; + super.field206 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field270.value) { + if (var2 != class39.field300.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -91,7 +83,7 @@ public class WorldMapData_0 extends AbstractWorldMapData { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && var2.regionY == super.regionY; + return super.regionX == var2.regionX && var2.regionY == super.regionY; } } @@ -99,77 +91,44 @@ public class WorldMapData_0 extends AbstractWorldMapData { return super.regionX | super.regionY << 8; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ILii;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-1022524213" + signature = "([BIIII[Lfm;B)V", + garbageValue = "-108" ) - public static void method189(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - TaskHandler.playMusicTrack(var0, var1, var6, var7, var4, var5); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - public static void method181() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-1614694262" - ) - static final boolean method187(int var0, int var1) { - ObjectDefinition var2 = Occluder.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method4675(var1); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-1897390403" - ) - static int method175(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class83.method2108(WorldMapIcon_0.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.dataText; + 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; + } } - - return 1; - } else { - return 2; } - } else { - int var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; } + + 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") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1448123046" + ) + static final void method263() { + Client.field874 = Client.cycleCntr; + Timer.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 86da01a59c..ce5133ddfb 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,39 +1,41 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ar") +@ObfuscatedName("ac") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("a") + @ObfuscatedName("lq") @ObfuscatedGetter( - intValue = -352069921 + intValue = -759112177 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("w") + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 650382493 + intValue = 1108561207 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 214088681 + intValue = -1693102949 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1958393799 + intValue = 1779998121 ) @Export("chunkX") int chunkX; - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1560494711 + intValue = -468577011 ) @Export("chunkY") int chunkY; @@ -41,47 +43,47 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "-431510829" + signature = "(Lkb;B)V", + garbageValue = "1" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field278.value) { + if (var2 != WorldMapID.field303.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 64; + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); this.chunkXLow = var1.readUnsignedByte(); this.chunkYLow = var1.readUnsignedByte(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5593(); - super.fileId = var1.method5593(); + super.groupId = var1.method5591(); + super.fileId = var1.method5591(); } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;S)V", - garbageValue = "-30591" + signature = "(Lkb;B)V", + garbageValue = "-78" ) @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.field188 = new byte[super.planes][64][64]; - super.field175 = new byte[super.planes][64][64]; + super.field205 = new byte[super.planes][64][64]; + super.field206 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field271.value) { + if (var2 != class39.field297.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -101,40 +103,40 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "35" + garbageValue = "3" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "105" + signature = "(I)I", + garbageValue = "-1104006476" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1796035286" + garbageValue = "-2123096151" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("g") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1186864483" + garbageValue = "-50915018" ) @Export("getChunkY") int getChunkY() { @@ -146,8 +148,8 @@ public class WorldMapData_1 extends AbstractWorldMapData { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { - return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { + return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; } else { return false; } @@ -158,77 +160,386 @@ public class WorldMapData_1 extends AbstractWorldMapData { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1587846163" + signature = "(B)Lcq;", + garbageValue = "-96" ) - @Export("savePreferences") - static void savePreferences() { + static ClientPreferences method813() { AccessFile var0 = null; + ClientPreferences var1 = new ClientPreferences(); try { - var0 = WorldMapRectangle.getPreferencesFile("", class14.field102.name, true); - Buffer var1 = WorldMapSection2.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { + 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.closeSync(true); + var0.close(); } - } catch (Exception var2) { + } catch (Exception var5) { } + return var1; } - @ObfuscatedName("j") - static boolean method732(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; - } - - @ObfuscatedName("q") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1876587331" + signature = "(ILce;ZB)I", + garbageValue = "66" ) - public static int method712(int var0) { - if (var0 > 0) { + static int method814(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; return 1; } else { - return var0 < 0 ? -1 : 0; + return 2; } } - @ObfuscatedName("ao") + @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(ILhj;ZB)V", - garbageValue = "89" + signature = "(Lgh;B)V", + garbageValue = "49" ) - static void method731(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var0); - int var4 = class192.localPlayer.plane; - int var5 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); - int var6 = Language.baseY * 64 + (class192.localPlayer.y >> 7); - Coord var7 = new Coord(var4, var5, var6); - GrandExchangeOfferUnitPriceComparator.getWorldMap().method6377(var3, var7, var1, var2); - } + 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); + } - @ObfuscatedName("gj") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1054316430" - ) - static void method733() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; + } 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]; + } - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class51.addPlayerToScene(Client.players[var1[var2]], true); + 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") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "85" + ) + @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); + } + + 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 a2a534686d..f3b791e35d 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,24 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("al") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("c") + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = 2038989741 + intValue = -1289499225 + ) + static int field245; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "[Lle;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = 620715937 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -727730927 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1678601373 + intValue = 1283555483 ) @Export("decoration") final int decoration; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1725461175 + intValue = 983246099 ) @Export("rotation") final int rotation; @@ -32,280 +49,39 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIILfk;Lfv;I)Z", - garbageValue = "-802024285" + signature = "(I)Lch;", + garbageValue = "-1617483479" ) - public static final boolean method346(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; - int var6 = var1; - byte var7 = 64; - byte var8 = 64; - int var9 = var0 - var7; - int var10 = var1 - var8; - class173.directions[var7][var8] = 99; - class173.distances[var7][var8] = 0; - byte var11 = 0; - int var12 = 0; - class173.bufferX[var11] = var0; - int var20 = var11 + 1; - class173.bufferY[var11] = var1; - int[][] var13 = var4.flags; - - while (true) { - label310: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label287: - do { - if (var12 == var20) { - ChatChannel.field1289 = var5; - class173.field2093 = var6; - return false; - } - - var5 = class173.bufferX[var12]; - var6 = class173.bufferY[var12]; - var12 = var12 + 1 & 4095; - var18 = var5 - var9; - var19 = var6 - var10; - var14 = var5 - var4.xInset; - var15 = var6 - var4.yInset; - if (var3.hasArrived(var2, var5, var6, var4)) { - ChatChannel.field1289 = var5; - class173.field2093 = var6; - return true; - } - - var16 = class173.distances[var18][var19] + 1; - if (var18 > 0 && class173.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class173.bufferX[var20] = var5 - 1; - class173.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class173.directions[var18 - 1][var19] = 2; - class173.distances[var18 - 1][var19] = var16; - break; - } - - if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && class173.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class173.bufferX[var20] = var5 + 1; - class173.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class173.directions[var18 + 1][var19] = 8; - class173.distances[var18 + 1][var19] = var16; - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { - break; - } - - ++var17; - } - } - - if (var19 > 0 && class173.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class173.bufferX[var20] = var5; - class173.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class173.directions[var18][var19 - 1] = 1; - class173.distances[var18][var19 - 1] = var16; - break; - } - - if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var19 < 128 - var2 && class173.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class173.bufferX[var20] = var5; - class173.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class173.directions[var18][var19 + 1] = 4; - class173.distances[var18][var19 + 1] = var16; - break; - } - - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 > 0 && class173.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class173.bufferX[var20] = var5 - 1; - class173.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class173.directions[var18 - 1][var19 - 1] = 3; - class173.distances[var18 - 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && var19 > 0 && class173.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class173.bufferX[var20] = var5 + 1; - class173.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class173.directions[var18 + 1][var19 - 1] = 9; - class173.distances[var18 + 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 < 128 - var2 && class173.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 - 1][var17 + var15] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { - continue label287; - } - } - - class173.bufferX[var20] = var5 - 1; - class173.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class173.directions[var18 - 1][var19 + 1] = 6; - class173.distances[var18 - 1][var19 + 1] = var16; - } - } while(var18 >= 128 - var2); - } while(var19 >= 128 - var2); - } while(class173.directions[var18 + 1][var19 + 1] != 0); - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); - - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { - continue label310; - } - } - - class173.bufferX[var20] = var5 + 1; - class173.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class173.directions[var18 + 1][var19 + 1] = 12; - class173.distances[var18 + 1][var19 + 1] = var16; - } - } + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return MouseHandler.getNextWorldListWorld(); } - @ObfuscatedName("e") + @ObfuscatedName("he") @ObfuscatedSignature( - signature = "(IZIZB)V", - garbageValue = "58" + signature = "(IIB)Lgx;", + garbageValue = "123" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class96.World_worlds != null) { - InterfaceParent.doWorldSorting(0, class96.World_worlds.length - 1, var0, var1, var2, var3); - } - + 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; } - @ObfuscatedName("hd") + @ObfuscatedName("kq") @ObfuscatedSignature( - signature = "(Lbs;I)V", - garbageValue = "447315853" + signature = "(I)V", + garbageValue = "2146125679" ) - static final void method347(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = ServerBuild.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = ServerBuild.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = ServerBuild.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = ServerBuild.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = ServerBuild.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = GrandExchangeEvents.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field924 = var4; - var0.field935 = var5; - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "(IIIIIIIB)V", - garbageValue = "-22" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (ScriptFrame.loadInterface(var0)) { - GrandExchangeOfferAgeComparator.updateInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } + @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 1fdddbe2fd..3baed403f7 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,4 +1,5 @@ -import java.io.IOException; +import java.io.DataInputStream; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,130 +9,125 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ha") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2745(0, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2728(1, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2729(2, 0), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2743(3, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2731(9, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2732(4, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2733(5, 1), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2734(6, 1), - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2749(7, 1), - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2736(8, 1), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2737(12, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2738(13, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2742(14, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2727(15, 2), @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lha;" ) - field2741(16, 2), - @ObfuscatedName("w") + field2732(0, 0), + @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lha;" ) - field2750(17, 2), + field2718(1, 0), @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lha;" ) - field2730(18, 2), + 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;" ) - field2744(19, 2), + field2724(5, 1), @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lha;" ) - field2740(20, 2), - @ObfuscatedName("y") + field2721(6, 1), + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lha;" ) - field2746(21, 2), - @ObfuscatedName("f") + field2726(7, 1), + @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lha;" ) - field2747(10, 2), + 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;" ) - field2748(11, 2), + field2736(20, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2733(21, 2), @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lha;" ) - field2751(22, 3); - - @ObfuscatedName("bt") + field2719(10, 2), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lli;" + signature = "Lha;" ) - static IndexedSprite field2739; - @ObfuscatedName("s") + field2739(11, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2740(22, 3); + + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1956687069 + intValue = -1867992849 ) @Export("id") public final int id; @@ -144,232 +140,612 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "57455087" + signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-1131770525" ) - public static boolean method4187() { - long var0 = WorldMapIcon_0.currentTimeMillis(); - int var2 = (int)(var0 - NetCache.field3170); - NetCache.field3170 = var0; - if (var2 > 200) { - var2 = 200; - } - - NetCache.NetCache_loadTime += var2; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - return true; - } else if (NetCache.NetCache_socket == null) { - return false; + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); } else { try { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var4 = new Buffer(4); - var4.writeByte(1); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var4 = new Buffer(4); - var4.writeByte(0); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - var3.removeDual(); - NetCache.NetCache_pendingResponses.put(var3, var3.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var15 = 0; var15 < 100; ++var15) { - int var16 = NetCache.NetCache_socket.available(); - if (var16 < 0) { - throw new IOException(); - } - - if (var16 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var5 = 0; - if (GrandExchangeEvent.NetCache_currentResponse == null) { - var5 = 8; - } else if (NetCache.field3181 == 0) { - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var6 > var16) { - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); - if (NetCache.field3184 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3184; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { - break; - } - - if (GrandExchangeEvent.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var11 = (long)(var8 + (var7 << 16)); - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); - User.field3583 = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - User.field3583 = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - GrandExchangeEvent.NetCache_currentResponse = var13; - VertexNormal.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + GrandExchangeEvent.NetCache_currentResponse.padding); - VertexNormal.NetCache_responseArchiveBuffer.writeByte(var9); - VertexNormal.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3181 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3181 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3181 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - GrandExchangeEvent.NetCache_currentResponse = null; - } - } - } else { - var6 = VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3181; - if (var7 > var6 - VertexNormal.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - VertexNormal.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(VertexNormal.NetCache_responseArchiveBuffer.array, VertexNormal.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3184 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = VertexNormal.NetCache_responseArchiveBuffer.array; - var10001 = VertexNormal.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3184; - } - } - - var22 = VertexNormal.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3181 += var7; - if (var6 == VertexNormal.NetCache_responseArchiveBuffer.offset) { - if (GrandExchangeEvent.NetCache_currentResponse.key == 16711935L) { - class4.NetCache_reference = VertexNormal.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - class4.NetCache_reference.offset = var8 * 8 + 5; - var10 = class4.NetCache_reference.readInt(); - int var18 = class4.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(VertexNormal.NetCache_responseArchiveBuffer.array, 0, var6); - var8 = (int)NetCache.NetCache_crc.getValue(); - if (var8 != GrandExchangeEvent.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var20) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3184 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - return false; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - GrandExchangeEvent.NetCache_currentResponse.archive.write((int)(GrandExchangeEvent.NetCache_currentResponse.key & 65535L), VertexNormal.NetCache_responseArchiveBuffer.array, (GrandExchangeEvent.NetCache_currentResponse.key & 16711680L) == 16711680L, User.field3583); - } - - GrandExchangeEvent.NetCache_currentResponse.remove(); - if (User.field3583) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3181 = 0; - GrandExchangeEvent.NetCache_currentResponse = null; - VertexNormal.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3181 != 512) { - break; - } - - NetCache.field3181 = 0; - } - } - } - - return true; - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { + String var2 = ""; + if (var1 != null) { + var2 = NetCache.method4393(var1); } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; + 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 edf21cf35d..f5febd7675 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,111 +4,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("io") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = -137008991 - ) - static int field3230; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("WorldMapElement_archive") - static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("t") + public static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lim;" + signature = "[Lio;" ) @Export("WorldMapElement_cached") - static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("e") + public static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("WorldMapElement_cachedSprites") static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1867958927 + intValue = 1778455375 ) @Export("objectId") public final int objectId; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1771257793 + intValue = -1839539911 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2048947883 + intValue = -1328409781 ) @Export("sprite2") int sprite2; - @ObfuscatedName("l") + @ObfuscatedName("z") @Export("name") public String name; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1188038203 + intValue = -66498181 ) - public int field3215; - @ObfuscatedName("m") + public int field3216; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1641997247 + intValue = -1404661325 ) @Export("textSize") public int textSize; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("n") + @ObfuscatedName("u") int[] field3220; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1973467605 + intValue = 244845295 ) - int field3217; - @ObfuscatedName("w") + int field3221; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1618776483 + intValue = -1082888487 ) int field3222; - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 249158163 + intValue = 677837161 ) int field3223; - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1378552349 + intValue = 639685945 ) - int field3224; - @ObfuscatedName("z") + int field3210; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lje;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lic;" + signature = "Lie;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("f") - int[] field3227; - @ObfuscatedName("b") - byte[] field3228; @ObfuscatedName("r") + int[] field3229; + @ObfuscatedName("o") + byte[] field3218; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 689795533 + intValue = -1088538707 ) @Export("category") public int category; @@ -117,28 +112,28 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); } - WorldMapElement(int var1) { + public WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3217 = Integer.MAX_VALUE; + this.field3221 = Integer.MAX_VALUE; this.field3222 = Integer.MAX_VALUE; this.field3223 = Integer.MIN_VALUE; - this.field3224 = Integer.MIN_VALUE; + this.field3210 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("o") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)V", - garbageValue = "1991794864" + signature = "(Lkb;B)V", + garbageValue = "-115" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -149,21 +144,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkp;IS)V", - garbageValue = "32767" + signature = "(Lkb;II)V", + garbageValue = "2055926497" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5593(); + this.sprite1 = var1.method5591(); } else if (var2 == 2) { - this.sprite2 = var1.method5593(); + this.sprite2 = var1.method5591(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3215 = var1.readMedium(); + this.field3216 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -192,23 +187,23 @@ public class WorldMapElement extends DualNode { var1.readInt(); var4 = var1.readUnsignedByte(); - this.field3227 = new int[var4]; + this.field3229 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field3227.length; ++var5) { - this.field3227[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3229.length; ++var5) { + this.field3229[var5] = var1.readInt(); } - this.field3228 = new byte[var3]; + this.field3218 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field3228[var5] = var1.readByte(); + this.field3218[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method5593(); + var1.method5591(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -223,47 +218,47 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method5593(); + var1.method5591(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)WorldMapSection0.findEnumerated(GraphicsObject.method2064(), var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)GrandExchangeEvent.findEnumerated(NetFileRequest.method4244(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)WorldMapSection0.findEnumerated(Message.method1229(), var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)GrandExchangeEvent.findEnumerated(Coord.method4084(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1639524352" + garbageValue = "1026224709" ) - void method4449() { + public void method4466() { if (this.field3220 != null) { for (int var1 = 0; var1 < this.field3220.length; var1 += 2) { - if (this.field3220[var1] < this.field3217) { - this.field3217 = this.field3220[var1]; + if (this.field3220[var1] < this.field3221) { + this.field3221 = this.field3220[var1]; } else if (this.field3220[var1] > this.field3223) { this.field3223 = this.field3220[var1]; } if (this.field3220[var1 + 1] < this.field3222) { this.field3222 = this.field3220[var1 + 1]; - } else if (this.field3220[var1 + 1] > this.field3224) { - this.field3224 = this.field3220[var1 + 1]; + } else if (this.field3220[var1 + 1] > this.field3210) { + this.field3210 = this.field3220[var1 + 1]; } } } } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ZB)Llt;", - garbageValue = "33" + signature = "(ZI)Lla;", + garbageValue = "2050095285" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -271,10 +266,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)Llt;", - garbageValue = "-1731622138" + signature = "(II)Lla;", + garbageValue = "122291326" ) @Export("getSprite") Sprite getSprite(int var1) { @@ -285,7 +280,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = WorldMapSection1.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = MusicPatchNode2.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -295,25 +290,35 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1106641241" + garbageValue = "1436204675" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("g") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(II)Lib;", + garbageValue = "-973838819" ) - public static void method4470() { - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index d53a4ab645..115fd274e5 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,25 +1,35 @@ +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; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("al") +@ObfuscatedName("ag") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("c") + @ObfuscatedName("sr") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 937006651 + intValue = 46773257 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lhj;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lhj;" ) @@ -35,123 +45,382 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("hm") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "560855047" + signature = "(II)J", + garbageValue = "984846325" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[Clock.Client_plane][var0][var1]; - if (var2 == null) { - ServerBuild.scene.removeGroundItemPile(Clock.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 = HealthBarDefinition.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) { - ServerBuild.scene.removeGroundItemPile(Clock.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 (var5.id != var6.id) { - if (var12 == null) { - var12 = var6; - } - - if (var12.id != var6.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = GameShell.calculateTag(var0, var1, 3, false, 0); - ServerBuild.scene.newGroundItemPile(Clock.Client_plane, var0, var1, WorldMapSectionType.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Clock.Client_plane), var5, var9, var12, var11); - } - } + public static long method868(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; } - @ObfuscatedName("jh") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "([Lhn;IB)V", - garbageValue = "-29" + signature = "(B)V", + garbageValue = "-5" ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !VarcInt.isComponentHidden(var3))) { - if (var3.type == 0) { - if (!var3.isIf3 && VarcInt.isComponentHidden(var3) && var3 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) { - continue; + 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."); + } 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; } - 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) { - GrandExchangeOfferNameComparator.method150(var4.group); + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; + break; } } + } catch (Exception var32) { + var1 = 0L; + } - if (var3.type == 6) { - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = ScriptFrame.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } + 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); - if (var5 != -1) { - SequenceDefinition var6 = GraphicsDefaults.SequenceDefinition_get(var5); + int var11; + for (var11 = 0; var11 < 4; ++var11) { + var26.writeInt(var34.nextInt()); + } - for (var3.modelFrameCycle += Client.field707; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; NPCDefinition.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; + 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 (var3.field2696 != 0 && !var3.isIf3) { - int var8 = var3.field2696 >> 16; - var5 = var3.field2696 << 16 >> 16; - var8 *= Client.field707; - var5 *= Client.field707; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - NPCDefinition.invalidateWidget(var3); - } + } catch (Throwable var31) { + var31.printStackTrace(); + var28 = 5; } + + var0 = var28; + } + + 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") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1831250087" + ) + static int method865(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class74.getWindowedMode(); + 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); + } + + 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; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + GrandExchangeOfferOwnWorldComparator.clientPreferences.windowMode = var3; + WorldMapArea.savePreferences(); + } + + return 1; + } + } } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 8a302285b2..b12e25a7e7 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -3,403 +3,181 @@ 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("au") +@ObfuscatedName("av") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lau;" + signature = "Lav;" ) - static final WorldMapID field277; - @ObfuscatedName("t") + static final WorldMapID field302; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lau;" + signature = "Lav;" ) - static final WorldMapID field278; - @ObfuscatedName("o") + static final WorldMapID field303; + @ObfuscatedName("hf") + @ObfuscatedSignature( + signature = "[Lle;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("jh") + @ObfuscatedSignature( + signature = "Lhe;" + ) + static Widget field307; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -632156307 + intValue = -96015239 ) @Export("value") final int value; static { - field277 = new WorldMapID(0); - field278 = new WorldMapID(1); + field302 = new WorldMapID(0); + field303 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)[Lhq;", - garbageValue = "1911999829" + signature = "(Lkj;B)V", + garbageValue = "30" ) - static ServerBuild[] method572() { - return new ServerBuild[]{ServerBuild.RC, ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.LIVE}; - } + static final void method648(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lbw;IB)V", - garbageValue = "0" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (Username.isWorldMapEvent(var0.type)) { - WorldMapLabelSize.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = PacketBufferNode.WorldMapElement_get(WorldMapLabelSize.worldMapEvent.mapElement); - var3 = class197.getWorldMapScript(var0.type, var4.objectId, var4.category); - } else { - var17 = (Integer)var2[0]; - var3 = UserComparator9.getScript(var17); + 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); + } + } + } } - if (var3 != null) { - class320.Interpreter_intStackSize = 0; - Message.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1094 = false; + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); - 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 : -1; - } - - if (var11 == -2147483644) { - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; - } - - if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; - } - - if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; - } - - if (var11 == -2147483640) { - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { - var11 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var9++] = var18; - } - } - - var10 = 0; - Interpreter.field1088 = var0.field582; - - 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 = LoginScreenAnimation.method1835(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[++class320.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - ServerPacket.changeGameOptions(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class320.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[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - DirectByteArrayCopier.method4006(var11, Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - class320.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - Message.Interpreter_stringStackSize -= var11; - String var31 = class290.method5360(Interpreter.Interpreter_stringStack, Message.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --class320.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --Message.Interpreter_stringStackSize; + 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 { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { - if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class197.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - class197.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var21 < 0 || var21 > 5000) { - throw new RuntimeException(); - } + class25.readPlayerUpdate(var0, var3); + } + } + } + } - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if (var20 == 105) { - var22 = 0; - } + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); - 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[--class320.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - class320.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = class197.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - class197.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = class197.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - class197.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Message.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[--class320.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; - Script var12 = UserComparator9.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 + (class320.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Message.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - class320.Interpreter_intStackSize -= var12.intArgumentCount; - Message.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; + 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); } } } - } 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(" "); + 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); + } + } + } } - var24.append("").append(var7); - class225.RunException_sendStackTrace(var24.toString(), var27); - } - } finally { - if (Interpreter.field1094) { - Interpreter.field1095 = true; - KeyHandler.method848(); - Interpreter.field1095 = false; - Interpreter.field1094 = false; - } + 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; + } + } + + } + } } } } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1853943165" - ) - static final String method570(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; - } - - @ObfuscatedName("kj") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1218090205" - ) - @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(); - } - - Message.method1228(); - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.clearFriends(); - } - - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1990682337" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (InterfaceParent.clanChat != null) { - PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index bbbc862854..07b0a71990 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,64 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("z") +@ObfuscatedName("an") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = 801956047 - ) - static int field142; - @ObfuscatedName("sn") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Lly;" + signature = "Lmx;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("dv") + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "Lkr;" + signature = "Lih;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("eg") + @Export("archive5") + static Archive archive5; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -201961779 - ) - static int field148; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -204680949 + intValue = -602879945 ) @Export("element") final int element; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lau;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 844262399 + intValue = -1634028725 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1735837545 + intValue = 497212545 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lhj;Lhj;ILaz;)V" + signature = "(Lhj;Lhj;ILau;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = PacketBufferNode.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = class25.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -73,207 +63,119 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1499764486" + signature = "(B)I", + garbageValue = "16" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Laz;", - garbageValue = "124" + signature = "(I)Lau;", + garbageValue = "2077771117" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "-26101" + signature = "(I)I", + garbageValue = "650401890" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-1828864081" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "74" + signature = "(Ljava/lang/String;II)Z", + garbageValue = "-1457680622" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); - if (var0 < VertexNormal.field1752) { - SpotAnimationDefinition.field3250 += VertexNormal.field1752 - var0; - } - - VertexNormal.field1752 = var0; - return SpotAnimationDefinition.field3250 + var0; + static boolean method306(String var0, int var1) { + return ItemContainer.method1274(var0, var1, "openjs"); } - @ObfuscatedName("o") + @ObfuscatedName("hk") @ObfuscatedSignature( - signature = "(Lks;I)V", - garbageValue = "-2023034499" + signature = "(I)V", + garbageValue = "1081049793" ) - static final void method206(PacketBuffer var0) { - int var1 = 0; + static final void method304() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; var0.importIndex(); - - byte[] var10000; + int var1 = var0.readBits(8); int var2; - int var3; - int var4; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1236[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class80.method2094(var0); - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - class208.readPlayerUpdate(var0, var3); - } - } + if (var1 < Client.npcCount) { + for (var2 = var1; var2 < Client.npcCount; ++var2) { + Client.field918[++Client.field801 - 1] = Client.npcIndices[var2]; } } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); + if (var1 > Client.npcCount) { + throw new RuntimeException(""); } else { - var0.importIndex(); + Client.npcCount = 0; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1236[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class80.method2094(var0); - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - class208.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.field1236[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class80.method2094(var0); - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class40.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); + 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 { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1236[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = class80.method2094(var0); - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class40.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1236; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field725[++Client.field851 - 1] = var3; } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.field1236; - 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; + 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; } + } 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 if (var6 == 3) { + Client.field918[++Client.field801 - 1] = var3; } - } } } - } - } - @ObfuscatedName("ks") - @ObfuscatedSignature( - signature = "(Lhn;I)I", - garbageValue = "2118498909" - ) - @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; + } } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index f69dfc1883..9f41777b09 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,48 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("af") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("c") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = 52552105 + intValue = -395695129 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1547579339 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lax;" + signature = "Lao;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1871075417 + intValue = -1354598699 ) @Export("element") int element; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lau;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -260537351 + intValue = 152564965 ) @Export("subWidth") int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -753416785 + intValue = -1072450563 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lhj;Lhj;ILax;)V" + signature = "(Lhj;Lhj;ILao;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -54,56 +60,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1499764486" + signature = "(B)I", + garbageValue = "16" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Laz;", - garbageValue = "124" + signature = "(I)Lau;", + garbageValue = "2077771117" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "-26101" + signature = "(I)I", + garbageValue = "650401890" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-1828864081" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1452393190" + signature = "(S)V", + garbageValue = "10774" ) @Export("init") void init() { - this.element = Occluder.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(PacketBufferNode.WorldMapElement_get(this.element)); - WorldMapElement var1 = PacketBufferNode.WorldMapElement_get(this.getElement()); + 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()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -115,68 +121,41 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([BILjava/lang/CharSequence;B)I", - garbageValue = "112" + signature = "(IB)I", + garbageValue = "39" ) - public static int method310(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; - - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); - } - } - - return var4 - var1; + public static int method407(int var0) { + return WorldMapRectangle.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("fg") + @ObfuscatedName("gz") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-8" + signature = "(II)V", + garbageValue = "265635085" ) - static final void method308() { - if (Client.logoutTimer > 0) { - class30.logOut(); + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field893 = 0L; + if (var0 >= 2) { + Client.isResizable = true; } else { - Client.timer.method5045(); - Projectile.updateGameState(40); - ClientPreferences.field1052 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } - - @ObfuscatedName("il") - @ObfuscatedSignature( - signature = "([Lhn;Lhn;ZB)V", - garbageValue = "42" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; - FloorUnderlayDefinition.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - FloorUnderlayDefinition.resizeInterface(var1.children, var1.id, var3, var4, var2); + Client.isResizable = false; } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - GrandExchangeOfferUnitPriceComparator.method135(var5.group, var3, var4, var2); + if (class74.getWindowedMode() == 1) { + WorldMapSection1.client.setMaxCanvasSize(765, 503); + } else { + WorldMapSection1.client.setMaxCanvasSize(7680, 2160); } - if (var1.contentType == 1337) { + if (Client.gameState >= 25) { + PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class74.getWindowedMode()); + var1.packetBuffer.writeShort(WorldMapLabel.canvasWidth); + var1.packetBuffer.writeShort(Varps.canvasHeight); + Client.packetWriter.addNode(var1); } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 8879165aef..a55027a88b 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -3,45 +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("az") +@ObfuscatedName("au") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "[[Lhn;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("fs") - @ObfuscatedGetter( - longValue = 2387271044298976721L - ) - static long field250; + @ObfuscatedName("q") + public static short[] field278; @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 710663083 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("fz") + @ObfuscatedSignature( + signature = "Ley;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("x") @Export("text") String text; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2063978581 + intValue = 622921631 ) @Export("width") int width; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1586627561 + intValue = 939857441 ) @Export("height") int height; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lq;" + signature = "Lae;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILq;)V" + signature = "(Ljava/lang/String;IILae;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -50,160 +54,105 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "104" + signature = "(ILce;ZI)I", + garbageValue = "-461076613" ) - public static int method440(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "43" - ) - static final void method439() { - class60.method1188("You can't add yourself to your own friend list"); - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "(Lia;Ljava/lang/String;I)V", - garbageValue = "16711680" - ) - static void method438(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field813 += var2.groupCount; - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - signature = "(ZLks;I)V", - garbageValue = "-1660108888" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; + static int method517(int var0, Script var1, boolean var2) { + int var3; int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method5740(); - int var3 = var1.readUnsignedShort(); - var4 = var1.readUnsignedShort(); - JagexCache.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - JagexCache.xteaKeys[var5][var6] = var1.readInt(); + 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]; } - } - FriendsList.regions = new int[var4]; - class30.regionMapArchiveIds = new int[var4]; - class65.regionLandArchiveIds = new int[var4]; - Tiles.regionLandArchives = new byte[var4][]; - class226.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { - var16 = true; - } + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; - 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)) { - FriendsList.regions[var4] = var8; - class30.regionMapArchiveIds[var4] = NetSocket.archive5.getGroupId("m" + var6 + "_" + var7); - class65.regionLandArchiveIds[var4] = NetSocket.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; + 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; } } - - ChatChannel.method2302(var3, var2, true); } else { - var2 = var1.method5614(); - boolean var15 = var1.method5605() == 1; - var4 = var1.method5762(); - 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); + 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 { - Client.instanceChunkTemplates[var6][var7][var8] = -1; + Interpreter.field1130 = var9; } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } + + return 1; + } else { + return 2; } - } - - var1.exportIndex(); - JagexCache.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - JagexCache.xteaKeys[var6][var7] = var1.readInt(); - } - } - - FriendsList.regions = new int[var5]; - class30.regionMapArchiveIds = new int[var5]; - class65.regionLandArchiveIds = new int[var5]; - Tiles.regionLandArchives = new byte[var5][]; - class226.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 (FriendsList.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - FriendsList.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - class30.regionMapArchiveIds[var5] = NetSocket.archive5.getGroupId("m" + var13 + "_" + var14); - class65.regionLandArchiveIds[var5] = NetSocket.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } + } 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; } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - } - ChatChannel.method2302(var2, var4, !var15); + return 1; + } } - } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 43f0788b48..dc0b0c8909 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,141 +4,346 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("ae") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("qw") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldw;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("rn") - @ObfuscatedGetter( - intValue = 1439744000 - ) - static int field139; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lq;" + signature = "Lae;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lq;" + signature = "Lae;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lq;" + signature = "Lae;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("d") - public static short[] field128; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lbz;" + signature = "Lle;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lal;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("er") + static IndexedSprite field160; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1639032335 + intValue = -1219677423 + ) + static int field158; + @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = -1644127547 ) @Export("port1") static int port1; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -147452209 + intValue = 17541419 ) - final int field127; - @ObfuscatedName("i") + final int field153; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -10868609 + intValue = 1519176047 ) - final int field132; - @ObfuscatedName("g") + final int field155; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 984617173 + intValue = 2055310893 ) - final int field131; + final int field152; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); + WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field127 = var1; - this.field132 = var2; - this.field131 = var3; + this.field153 = var1; + this.field155 = var2; + this.field152 = var3; } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(FI)Z", - garbageValue = "-680427426" + signature = "(FB)Z", + garbageValue = "-55" ) - boolean method192(float var1) { - return var1 >= (float)this.field131; + boolean method289(float var1) { + return var1 >= (float)this.field152; } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1845192428" + signature = "(I)[Lae;", + garbageValue = "-1367790562" ) - static void method198() { - ItemContainer.itemContainers = new NodeHashTable(32); + static WorldMapLabelSize[] method284() { + return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1220899418" + signature = "(Liy;Liy;ZI)V", + garbageValue = "-1100564340" ) - public static void method197(boolean var0) { - if (var0 != class298.ItemDefinition_inMembersWorld) { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - class298.ItemDefinition_inMembersWorld = var0; + 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; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); } } - @ObfuscatedName("am") + @ObfuscatedName("jj") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2070539914" + signature = "(Lhe;III)V", + garbageValue = "-1189563111" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (ScriptFrame.loadInterface(var0)) { - Widget[] var1 = WorldMapLabel.Widget_interfaceComponents[var0]; + static final void method288(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + IgnoreList.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - WorldMapID.runScript(var4, 5000000); + 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); + } + } + + 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); + } } } + } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 442fd7f3b8..7a9c00fe70 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -8,101 +8,111 @@ 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("ak") +@ObfuscatedName("aj") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("a") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("c") + @ObfuscatedName("qd") + @ObfuscatedSignature( + signature = "Ldw;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("dj") + @ObfuscatedSignature( + signature = "Lfr;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("x") @Export("loaded") boolean loaded; - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Law;" + signature = "Lad;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Llt;" + signature = "Lla;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("i") + @ObfuscatedName("w") @Export("icons") HashMap icons; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[[Lax;" + signature = "[[Lao;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("d") - HashMap field324; - @ObfuscatedName("l") + @ObfuscatedName("q") + HashMap field359; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Lli;" + signature = "[Lle;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lii;" + signature = "Liy;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("p") + @ObfuscatedName("s") @Export("fonts") final HashMap fonts; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 792568209 + intValue = -1440050247 ) @Export("tileX") int tileX; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -394276419 + intValue = 2084338799 ) @Export("tileY") int tileY; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -744573755 + intValue = 1804049707 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 439051201 + intValue = 793863639 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -139789011 + intValue = 1333710855 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Lli;Ljava/util/HashMap;Lii;Lii;)V" + signature = "([Lle;Ljava/util/HashMap;Liy;Liy;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field324 = new HashMap(); + this.field359 = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -110,10 +120,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;Ljava/lang/String;ZI)V", - garbageValue = "1034038969" + signature = "(Liy;Ljava/lang/String;ZI)V", + garbageValue = "1660505626" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -121,10 +131,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field313.name); + int var4 = var1.getGroupId(WorldMapCacheName.field339.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field313.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field309.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field339.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field340.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -146,7 +156,7 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + PendingSpawn.method1840(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -171,9 +181,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field310.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field310.name, var2); - this.compositeTextureSprite = class14.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field341.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field341.name, var2); + this.compositeTextureSprite = class200.convertJpgToSprite(var20); } System.nanoTime(); @@ -183,20 +193,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2129677243" + garbageValue = "2062651870" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IIIIIIIIB)V", - garbageValue = "-91" + garbageValue = "8" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -209,59 +219,59 @@ public final class WorldMapManager { float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field324.containsKey(var15)) { - class40 var16 = new class40(var15); + if (!this.field359.containsKey(var15)) { + class49 var16 = new class49(var15); var16.init(); - this.field324.put(var15, var16); + this.field359.put(var15, var16); } int var23 = var13.width + var13.x - 1; - int var17 = var13.y + var13.height - 1; + int var17 = var13.height + var13.y - 1; int var18; int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class40)this.field324.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (class49)this.field359.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(64.0F * var14); - var19 = this.tileX * 4096 + var1; - int var20 = this.tileY * 4096 + var2; + var18 = (int)(var14 * 64.0F); + var19 = this.tileX + var1; + 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].method442(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); + this.regions[var21][var22].method519(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); } } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "952569644" + signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", + garbageValue = "18" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var16 = (int)(var15 * 64.0F); - int var17 = this.tileX * 4096 + var1; - int var18 = this.tileY * 4096 + var2; + int var17 = this.tileX + var1; + int var18 = var2 + this.tileY; int var19; int var20; - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { if (var13) { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method452(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); + this.regions[var19][var20].method529(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } @@ -275,10 +285,10 @@ public final class WorldMapManager { } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "-1" + garbageValue = "73" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -306,8 +316,8 @@ public final class WorldMapManager { while (var11.hasNext()) { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 4096); - int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 4096); + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } @@ -315,25 +325,25 @@ public final class WorldMapManager { } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "-89" + signature = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "1400578411" ) - public List method643(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method722(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(64.0F * var13); - int var15 = this.tileX * 4096 + var1; - int var16 = this.tileY * 4096 + var2; + int var14 = (int)(var13 * 64.0F); + int var15 = this.tileX + var1; + int var16 = var2 + this.tileY; for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method472(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { + List var19 = this.regions[var17][var18].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); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -344,18 +354,18 @@ public final class WorldMapManager { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIII)Lr;", - garbageValue = "1051811475" + signature = "(IIIII)Lar;", + garbageValue = "-1850062895" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); - int var6 = this.tileX * 4096 + var1; - int var7 = this.tileY * 4096 + var2; - int var8 = var3 + this.tileX * 4096; - int var9 = this.tileY * 4096 + var4; + int var6 = this.tileX + var1; + int var7 = var2 + this.tileY; + int var8 = var3 + this.tileX; + int var9 = var4 + this.tileY; int var10 = var6 / 64; int var11 = var7 / 64; int var12 = var8 / 64; @@ -387,20 +397,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "0" + garbageValue = "8" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)Ljava/util/HashMap;", - garbageValue = "-24" + garbageValue = "-55" ) @Export("buildIcons") public HashMap buildIcons() { @@ -408,10 +418,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "241719352" + garbageValue = "1203186095" ) @Export("buildIcons0") void buildIcons0() { @@ -445,10 +455,10 @@ public final class WorldMapManager { } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIB)F", - garbageValue = "76" + signature = "(III)F", + garbageValue = "-1899828753" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -463,33 +473,33 @@ public final class WorldMapManager { } } - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "487477583" + signature = "(ILce;ZI)I", + garbageValue = "345752229" ) - public static boolean method673(int var0) { - return (var0 >> 30 & 1) != 0; - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "9" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = SpriteMask.getWidgetChild(FontName.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - class4.runScriptEvent(var1); - } - - Client.isSpellSelected = false; - NPCDefinition.invalidateWidget(var0); + 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; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index bc3115ee11..d976283114 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,150 +1,285 @@ -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("r") +@ObfuscatedName("ar") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("pb") + @ObfuscatedName("sw") @ObfuscatedSignature( - signature = "Llt;" + signature = "Lin;" ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("c") + public static class247 field222; + @ObfuscatedName("rt") @ObfuscatedGetter( - intValue = 1400048681 + intValue = 396400765 + ) + static int field217; + @ObfuscatedName("hj") + @ObfuscatedGetter( + intValue = 1285501421 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 2118227677 ) @Export("width") int width; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1470820319 + intValue = -245816907 ) @Export("height") int height; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -86733365 + intValue = -1773088179 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 204657909 + intValue = -409358263 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - signature = "Lak;" + signature = "Laj;" ) final WorldMapManager this$0; @ObfuscatedSignature( - signature = "(Lak;)V" + signature = "(Laj;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmx;", - garbageValue = "636335371" + signature = "(II)I", + garbageValue = "-1866970355" ) - @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 (GrandExchangeOfferOwnWorldComparator.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (GrandExchangeOfferOwnWorldComparator.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(UserComparator4.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(); - } + public static int method388(int var0) { + return var0 >> 11 & 63; } @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(IIS)Lbn;", - garbageValue = "-2264" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } - @ObfuscatedName("i") + @ObfuscatedName("gd") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1219570731" + signature = "(I)Z", + garbageValue = "767205713" ) - @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; + 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); + } + + 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); + } + } + } + } } - - } - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "2037508438" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class192.scrollBarSprites[0].drawAt(var0, var1); - class192.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field870); - 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.field709); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field711); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field711); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field711); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field711); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field710); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field710); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field710); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field710); + 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); + } + } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 4857d7a862..e9bb03ba96 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -1,4 +1,3 @@ -import java.awt.Image; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -11,63 +10,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("ao") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("i") + @ObfuscatedName("ss") @ObfuscatedSignature( - signature = "Lek;" + signature = "Llq;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lfl;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("aq") - static Image field254; - @ObfuscatedName("lw") + @ObfuscatedName("dp") @ObfuscatedSignature( - signature = "Lck;" + signature = "Lih;" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("g") + @Export("archive11") + static Archive archive11; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1472843841 + intValue = -1197836781 ) @Export("regionX") int regionX; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -973536499 + intValue = -1627893231 ) @Export("regionY") int regionY; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lw;" + signature = "Ly;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 60788551 + intValue = 594891015 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1753597571 + intValue = -411328267 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("h") + @ObfuscatedName("p") @Export("icon0List") List icon0List; - @ObfuscatedName("v") + @ObfuscatedName("n") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("fonts") final HashMap fonts; @@ -85,13 +88,16 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "24692551" + garbageValue = "800782831" ) - void method442(int var1, int var2, int var3) { - Sprite var4 = class60.method1187(this.regionX, this.regionY, this.pixelsPerTile); + 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)); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -102,10 +108,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lw;Ljava/util/List;B)V", - garbageValue = "-57" + signature = "(Ly;Ljava/util/List;I)V", + garbageValue = "1320723450" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -114,10 +120,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "369325117" + garbageValue = "-1524913173" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -134,15 +140,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIILb;I)V", - garbageValue = "1972581880" + signature = "(IIIILab;S)V", + garbageValue = "-7361" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label51: + label50: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -151,10 +157,10 @@ public class WorldMapRegion { for (int var11 = 0; var11 < var10.length; ++var11) { WorldMapDecoration var12 = var10[var11]; - ObjectDefinition var13 = Occluder.getObjectDefinition(var12.objectDefinitionId); - if (SoundSystem.method2565(var13)) { + ObjectDefinition var13 = WorldMapSection2.getObjectDefinition(var12.objectDefinitionId); + if (Tiles.method1239(var13)) { this.getIcon(var13, var8, var6, var7, var5); - continue label51; + continue label50; } } } @@ -164,37 +170,37 @@ public class WorldMapRegion { } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lir;IIILb;S)V", - garbageValue = "24571" + signature = "(Ljw;IIILab;I)V", + garbageValue = "-332727967" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); Coord var7 = null; if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, this.worldMapData_0.regionYLow * 4096 + var4); + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 4096 + var4 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + 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 = PacketBufferNode.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = class25.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("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "93681400" + signature = "(S)V", + garbageValue = "128" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -209,10 +215,10 @@ public class WorldMapRegion { } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "1607698315" + garbageValue = "-2024138363" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -221,19 +227,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.method527(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method548(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1410735729" + garbageValue = "-949994571" ) - void method475() { + void method526() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -247,10 +253,10 @@ public class WorldMapRegion { } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lii;B)Z", - garbageValue = "51" + signature = "(Liy;I)Z", + garbageValue = "155508897" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -288,53 +294,60 @@ public class WorldMapRegion { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILav;[Lli;Lii;Lii;I)V", - garbageValue = "-1022935376" + signature = "(ILah;[Lle;Liy;Liy;I)V", + garbageValue = "828020907" ) @Export("drawTile") - void drawTile(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { + void drawTile(int var1, class49 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (class60.method1187(this.regionX, this.regionY, var1) == null) { - boolean var6 = true; - var6 &= this.loadGeography(var4); - int var8; + 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 (this.worldMapData_0 != null) { - var8 = this.worldMapData_0.groupId; + var11 = this.worldMapData_0.groupId; } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var6 &= var5.tryLoadGroup(var8); - if (var6) { - byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9 = PlayerType.method4204(var7); - Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var10.setRaster(); - if (this.worldMapData_0 != null) { - this.method454(var2, var3, var9); + var9 &= var5.tryLoadGroup(var11); + if (var9) { + byte[] var10 = var5.takeFileFlat(var11); + WorldMapSprite var12; + if (var10 == null) { + var12 = new WorldMapSprite(); } else { - this.method455(var2, var3, var9); + var12 = new WorldMapSprite(class200.convertJpgToSprite(var10).pixels); } - int var11 = this.regionX; - int var12 = this.regionY; - int var13 = this.pixelsPerTile; - DemotingHashTable var14 = WorldMapRegion_cachedSprites; - long var16 = (long)(var13 << 16 | var11 << 8 | var12); - var14.put(var10, var16, var10.pixels.length * 4); - this.method475(); + Sprite var14 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var14.setRaster(); + if (this.worldMapData_0 != null) { + this.method531(var2, var3, var12); + } else { + this.method532(var2, var3, var12); + } + + 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(); } } } } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(IIILjava/util/HashSet;B)V", - garbageValue = "68" + garbageValue = "-19" ) - void method452(int var1, int var2, int var3, HashSet var4) { + void method529(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -343,10 +356,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;IIB)V", - garbageValue = "115" + garbageValue = "-1" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -357,44 +370,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = PacketBufferNode.WorldMapElement_get(var6); + WorldMapElement var7 = class25.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method462(var1, var2, var3); + this.method540(var1, var2, var3); } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lav;[Lli;Laf;S)V", - garbageValue = "27653" + signature = "(Lah;[Lle;Lam;I)V", + garbageValue = "-1199825986" ) - void method454(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method531(class49 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.method458(var4, var5, this.worldMapData_0, var1); + this.method535(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method456(var4, var5, this.worldMapData_0, var1, var2); + this.method533(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lav;[Lli;Laf;I)V", - garbageValue = "-532871376" + signature = "(Lah;[Lle;Lam;B)V", + garbageValue = "-33" ) - void method455(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method532(class49 var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -406,7 +419,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.method458(var6, var7, var5, var1); + this.method535(var6, var7, var5, var1); } } } @@ -418,30 +431,30 @@ 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.method456(var6, var7, var5, var1, var2); + this.method533(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IILb;Lav;[Lli;I)V", - garbageValue = "1825239742" + signature = "(IILab;Lah;[Lle;I)V", + garbageValue = "642220126" ) - void method456(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { - this.method461(var1, var2, var3); - this.method542(var1, var2, var3, var5); + void method533(int var1, int var2, AbstractWorldMapData var3, class49 var4, IndexedSprite[] var5) { + this.method527(var1, var2, var3); + this.method518(var1, var2, var3, var5); } - @ObfuscatedName("q") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IILb;Lav;Laf;B)V", - garbageValue = "-20" + signature = "(IILab;Lah;Lam;I)V", + garbageValue = "700550528" ) @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class40 var4, WorldMapSprite var5) { + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class49 var4, WorldMapSprite var5) { int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; int var7 = var3.floorOverlayIds[0][var1][var2] - 1; if (var6 == -1 && var7 == -1) { @@ -450,56 +463,56 @@ public class WorldMapRegion { int var8 = 16711935; if (var7 != -1) { - var8 = AbstractUserComparator.method5119(var7, this.backgroundColor); + var8 = class169.method3545(var7, this.backgroundColor); } - if (var7 > -1 && var3.field188[0][var1][var2] == 0) { + if (var7 > -1 && var3.field205[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method459(var1, var2, var3, var5); + int var9 = this.method536(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field188[0][var1][var2], var3.field175[0][var1][var2]); + 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]); } } } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IILb;Lav;B)V", - garbageValue = "29" + signature = "(IILab;Lah;B)V", + garbageValue = "7" ) - void method458(int var1, int var2, AbstractWorldMapData var3, class40 var4) { + void method535(int var1, int var2, AbstractWorldMapData var3, class49 var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = AbstractUserComparator.method5119(var6, this.backgroundColor); - if (var3.field188[var5][var1][var2] == 0) { + int var7 = class169.method3545(var6, this.backgroundColor); + if (var3.field205[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field188[var5][var1][var2], var3.field175[var5][var1][var2]); + 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]); } } } } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IILb;Laf;I)I", - garbageValue = "1830841056" + signature = "(IILab;Lam;I)I", + garbageValue = "1185225383" ) - int method459(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method536(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IILb;[Lli;I)V", - garbageValue = "-1911702637" + signature = "(IILab;[Lle;I)V", + garbageValue = "-2109478496" ) - void method542(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method518(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -507,22 +520,20 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field2747.id && var11 <= WorldMapDecorationType.field2748.id; - if (!var10) { - int var13 = var9.decoration; - boolean var12 = var13 == WorldMapDecorationType.field2751.id; - if (!var12) { + if (!Entity.method3374(var9.decoration)) { + int var11 = var9.decoration; + boolean var10 = var11 == WorldMapDecorationType.field2740.id; + if (!var10) { continue; } } - ObjectDefinition var14 = Occluder.getObjectDefinition(var9.objectDefinitionId); - if (var14.mapSceneId != -1) { - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { - var4[var14.mapSceneId].method6162(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + ObjectDefinition var12 = WorldMapSection2.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); } else { - var4[var14.mapSceneId].method6162(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var12.mapSceneId].method6211(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -531,12 +542,12 @@ public class WorldMapRegion { } - @ObfuscatedName("a") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IILb;B)V", - garbageValue = "124" + signature = "(IILab;B)V", + garbageValue = "-16" ) - void method461(int var1, int var2, AbstractWorldMapData var3) { + void method527(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -544,46 +555,48 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (class215.method4098(var8.decoration)) { - ObjectDefinition var9 = Occluder.getObjectDefinition(var8.objectDefinitionId); - int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2745.id) { - this.method474(var1, var2, var8.rotation, var10); + int var10 = var8.decoration; + boolean var9 = var10 >= WorldMapDecorationType.field2732.id && var10 <= WorldMapDecorationType.field2742.id || var10 == WorldMapDecorationType.field2722.id; + if (var9) { + ObjectDefinition var11 = WorldMapSection2.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.field2729.id) { - this.method474(var1, var2, var8.rotation, -3355444); - this.method474(var1, var2, var8.rotation + 1, var10); + 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.field2743.id) { + if (var8.decoration == WorldMapDecorationType.field2742.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } } - if (var8.decoration == WorldMapDecorationType.field2731.id) { - int var11 = var8.rotation % 2; - int var12; - if (var11 == 0) { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); + if (var8.decoration == WorldMapDecorationType.field2722.id) { + int var13 = var8.rotation % 2; + int var14; + if (var13 == 0) { + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); } } } @@ -594,10 +607,10 @@ public class WorldMapRegion { } - @ObfuscatedName("u") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;IB)V", - garbageValue = "0" + signature = "(IILjava/util/HashSet;II)V", + garbageValue = "-1793934594" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -608,33 +621,33 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); + int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = PacketBufferNode.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = class25.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method464(var12, var10, var11, var5); + this.method542(var12, var10, var11, var5); } } } } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "-1071751507" + garbageValue = "1080849523" ) - void method462(HashSet var1, int var2, int var3) { + void method540(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = PacketBufferNode.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = class25.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -643,10 +656,10 @@ public class WorldMapRegion { } - @ObfuscatedName("af") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Lim;IIIII)V", - garbageValue = "-1197729019" + signature = "(Lio;IIIIS)V", + garbageValue = "4032" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -661,51 +674,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("az") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Laq;IIFI)V", - garbageValue = "1534563948" + signature = "(Lax;IIFI)V", + garbageValue = "1195952860" ) - void method464(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = PacketBufferNode.WorldMapElement_get(var1.getElement()); - this.method465(var5, var2, var3); - this.method460(var1, var5, var2, var3, var4); + 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); } - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Lim;IIB)V", - garbageValue = "59" + signature = "(Lio;IIB)V", + garbageValue = "15" ) - void method465(WorldMapElement var1, int var2, int var3) { + void method543(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method524(var4, var1.horizontalAlignment); - int var6 = this.method469(var4, var1.verticalAlignment); + int var5 = this.method546(var4, var1.horizontalAlignment); + int var6 = this.method547(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("aj") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Laq;Lim;IIFI)V", - garbageValue = "2135973075" + signature = "(Lax;Lio;IIFI)V", + garbageValue = "630638914" ) - void method460(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method544(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method192(var5)) { + if (var6.size.method289(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3215, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3216, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("au") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;IB)V", - garbageValue = "-57" + signature = "(IILjava/util/HashSet;II)V", + garbageValue = "-1206739508" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -717,85 +730,84 @@ public class WorldMapRegion { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var1 + var5 * (float)var8); - var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); if (!var3.contains(var7.getElement())) { - this.method464(var7, var7.screenX, var7.screenY, var5); + this.method542(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Llt;Lih;B)I", - garbageValue = "-44" + signature = "(Lla;Lje;B)I", + garbageValue = "1" ) - int method524(Sprite var1, HorizontalAlignment var2) { + int method546(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { case 0: - return 0; - case 1: return -var1.subWidth / 2; + case 2: + return 0; default: return -var1.subWidth; } } - @ObfuscatedName("aa") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Llt;Lic;I)I", - garbageValue = "1263279649" + signature = "(Lla;Lie;B)I", + garbageValue = "-110" ) - int method469(Sprite var1, VerticalAlignment var2) { + int method547(Sprite var1, VerticalAlignment var2) { switch(var2.value) { case 0: - return -var1.subHeight / 2; - case 2: return 0; + case 1: + return -var1.subHeight / 2; default: return -var1.subHeight; } } - @ObfuscatedName("as") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(II)Laz;", - garbageValue = "-2048632100" + signature = "(II)Lau;", + garbageValue = "1415397741" ) - WorldMapLabel method527(int var1) { - WorldMapElement var2 = PacketBufferNode.WorldMapElement_get(var1); + WorldMapLabel method548(int var1) { + WorldMapElement var2 = class25.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("ak") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lim;I)Laz;", - garbageValue = "-340039451" + signature = "(Lio;B)Lau;", + garbageValue = "93" ) @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 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_small, WorldMapLabelSize.WorldMapLabelSize_large}; - WorldMapLabelSize[] var5 = var4; - int var6 = 0; + WorldMapLabelSize[] var4 = WorldMapLabelSize.method284(); + int var5 = 0; WorldMapLabelSize var2; while (true) { - if (var6 >= var5.length) { + if (var5 >= var4.length) { var2 = null; break; } - WorldMapLabelSize var7 = var5[var6]; - if (var3 == var7.field132) { - var2 = var7; + WorldMapLabelSize var6 = var4[var5]; + if (var3 == var6.field155) { + var2 = var6; break; } - ++var6; + ++var5; } if (var2 == null) { @@ -805,12 +817,12 @@ public class WorldMapRegion { if (var14 == null) { return null; } else { - 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 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; int var9 = 0; - String[] var10 = var15; + String[] var10 = var7; for (int var11 = 0; var11 < var10.length; ++var11) { String var12 = var10[var11]; @@ -828,12 +840,12 @@ public class WorldMapRegion { } } - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IIIIIB)Ljava/util/List;", - garbageValue = "1" + signature = "(IIIIII)Ljava/util/List;", + garbageValue = "-1740751209" ) - List method472(int var1, int var2, int var3, int var4, int var5) { + List method606(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) { @@ -865,10 +877,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("aw") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(B)Ljava/util/List;", - garbageValue = "-63" + signature = "(I)Ljava/util/List;", + garbageValue = "-1911332956" ) @Export("icons") List icons() { @@ -878,12 +890,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(IIIIS)V", - garbageValue = "-4117" + signature = "(IIIIB)V", + garbageValue = "-23" ) - void method474(int var1, int var2, int var3, int var4) { + void method552(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); @@ -894,7 +906,7 @@ public class WorldMapRegion { } if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { @@ -903,329 +915,183 @@ public class WorldMapRegion { } - @ObfuscatedName("v") + @ObfuscatedName("fa") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "403246047" + signature = "(I)V", + garbageValue = "294809885" ) - static final int method564(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + static final void method630() { + int[] var0 = Players.Players_indices; - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "(Lbx;I)V", - garbageValue = "-1195764731" - ) - static final void method565(Actor var0) { - var0.movementSequence = var0.readySequence; - if (var0.pathLength == 0) { - var0.field997 = 0; - } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var1 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); - if (var0.field998 > 0 && var1.field3523 == 0) { - ++var0.field997; - return; + 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; } - - if (var0.field998 <= 0 && var1.field3524 == 0) { - ++var0.field997; - return; - } - } - - int var10 = var0.x; - int var2 = var0.y; - int var3 = var0.pathX[var0.pathLength - 1] * 128 + var0.field942 * 2013925376; - int var4 = var0.pathY[var0.pathLength - 1] * 128 + var0.field942 * 2013925376; - 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.field975 != 0) { - var8 = 2; - } - - if (var0.pathLength > 2) { - var8 = 6; - } - - if (var0.pathLength > 3) { - var8 = 8; - } - - if (var0.field997 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field997; - } - } else { - if (var0.pathLength > 1) { - var8 = 6; - } - - if (var0.pathLength > 2) { - var8 = 8; - } - - if (var0.field997 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field997; - } - } - - if (var5 == 2) { - var8 <<= 1; - } - - if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var10 != var3 || var4 != var2) { - if (var10 < var3) { - var0.x += var8; - if (var0.x > var3) { - var0.x = var3; - } - } else if (var10 > var3) { - var0.x -= var8; - if (var0.x < var3) { - var0.x = var3; - } - } - - if (var2 < var4) { - var0.y += var8; - if (var0.y > var4) { - var0.y = var4; - } - } else if (var2 > var4) { - var0.y -= var8; - if (var0.y < var4) { - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { - --var0.pathLength; - if (var0.field998 > 0) { - --var0.field998; - } - } - - } else { - var0.x = var3; - var0.y = var4; - --var0.pathLength; - if (var0.field998 > 0) { - --var0.field998; - } - } } + + 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("ku") + @ObfuscatedName("ie") @ObfuscatedSignature( - signature = "(Lhn;IIII)V", - garbageValue = "-1636455277" + signature = "(Ljj;IIII)V", + garbageValue = "-283435223" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - UserComparator3.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 = class192.localPlayer.x / 32 + 48; - int var7 = 464 - class192.localPlayer.y / 32; - WorldMapRectangle.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + @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(); + } - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - class192.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class192.localPlayer.y / 32; - Script.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } + 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); + } - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[Clock.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - class192.localPlayer.x / 32; - var12 = var9 * 4 + 2 - class192.localPlayer.y / 32; - Script.drawSpriteOnMinimap(var1, var2, var11, var12, AbstractWorldMapData.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(); + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; } - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - class192.localPlayer.x / 32; - var12 = var16.y / 32 - class192.localPlayer.y / 32; - Script.drawSpriteOnMinimap(var1, var2, var11, var12, AbstractWorldMapData.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 != class192.localPlayer) { - var12 = var17.x / 32 - class192.localPlayer.x / 32; - int var13 = var17.y / 32 - class192.localPlayer.y / 32; - boolean var14 = false; - if (class192.localPlayer.team != 0 && var17.team != 0 && var17.team == class192.localPlayer.team) { - var14 = true; + if (var0.isFollower && Client.followerOpsLowPriority) { + IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(16776960) + var4, 1003, var1, var2, var3); } - if (var17.isFriend()) { - Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[3], var4); - } else if (var14) { - Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[5], var4); + 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 { - Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[2], var4); + 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); + } } + } } - - 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 - class192.localPlayer.x / 32; - var12 = var20.y / 32 - class192.localPlayer.y / 32; - KeyHandler.worldToMinimap(var1, var2, var11, var12, StructDefinition.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - Messages.baseX * 256 + 2 - class192.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - Language.baseY * 256 + 2 - class192.localPlayer.y / 32; - KeyHandler.worldToMinimap(var1, var2, var10, var11, StructDefinition.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 - class192.localPlayer.x / 32; - var12 = var21.y / 32 - class192.localPlayer.y / 32; - KeyHandler.worldToMinimap(var1, var2, var11, var12, StructDefinition.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class192.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - class192.localPlayer.y / 32; - Script.drawSpriteOnMinimap(var1, var2, var10, var11, StructDefinition.mapMarkerSprites[0], var4); - } - - if (!class192.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.field852[var3] = true; } } - @ObfuscatedName("kk") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-57958183" + signature = "(B)V", + garbageValue = "-59" ) - public static void method563(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = TilePaint.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeInt(var3 ? Client.field727 : 0); - var4.packetBuffer.writeShortLE(var0); - var4.packetBuffer.writeShort(var1); - var4.packetBuffer.writeByte(var2); - Client.packetWriter.addNode(var4); + static final void method537() { + 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/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 71161c1261..a587e4cf34 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ay") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1034100543" + signature = "(Las;I)V", + garbageValue = "1890497148" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-110" + signature = "(IIII)Z", + garbageValue = "-65934716" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "37" + signature = "(III)Z", + garbageValue = "-240937232" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-96920779" + garbageValue = "1656767825" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)Lhj;", - garbageValue = "911083222" + garbageValue = "-226825052" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "76" + signature = "(Lkb;I)V", + garbageValue = "-1393433755" ) @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 c02c5a4c28..f85706d489 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("ai") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2146402029 + intValue = 713824535 ) @Export("oldZ") int oldZ; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2085039341 + intValue = -1876975141 ) @Export("newZ") int newZ; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 555505141 + intValue = -1131302305 ) @Export("oldX") int oldX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1856751623 + intValue = -676651519 ) @Export("oldY") int oldY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2086851217 + intValue = -1875954061 ) @Export("newX") int newX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1346820565 + intValue = -391734637 ) @Export("newY") int newY; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1459523587 + intValue = 858906315 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("l") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -954702965 + intValue = 2112793997 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1622063887 + intValue = -902525679 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2070491231 + intValue = 519445535 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1112408651 + intValue = -2051517669 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("h") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -749966597 + intValue = 878808507 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1079927535 + intValue = 671796187 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 524547303 + intValue = -362726853 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,10 +95,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1034100543" + signature = "(Las;I)V", + garbageValue = "1890497148" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -120,49 +120,49 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-110" + signature = "(IIII)Z", + garbageValue = "-65934716" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { return false; } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "37" + signature = "(III)Z", + garbageValue = "-240937232" ) @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("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-96920779" + garbageValue = "1656767825" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.newX * 64 - this.oldX * 64 + var2 + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; return var4; } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)Lhj;", - garbageValue = "911083222" + garbageValue = "-226825052" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -170,15 +170,15 @@ public class WorldMapSection0 implements WorldMapSection { return null; } else { int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; - int var4 = this.oldY * 64 - this.newY * 64 + var2 + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); return new Coord(this.oldZ, var3, var4); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "76" + signature = "(Lkb;I)V", + garbageValue = "-1393433755" ) @Export("read") public void read(Buffer var1) { @@ -199,368 +199,202 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-127" + signature = "(I)V", + garbageValue = "-1832298319" ) @Export("postRead") void postRead() { } - @ObfuscatedName("c") + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "([Lgq;IB)Lgq;", - garbageValue = "-32" + signature = "(IIII)V", + garbageValue = "-1632092038" ) - @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; + @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[class74.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class74.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; } - } - return null; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } } - @ObfuscatedName("ha") + @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "(IIIIIIIS)V", - garbageValue = "6328" + signature = "(Lkj;I)V", + garbageValue = "1398134743" ) - @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 != Clock.Client_plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = ServerBuild.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = ServerBuild.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = ServerBuild.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = ServerBuild.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { - var12 = ServerBuild.scene.getObjectFlags(var0, var2, var3, var7); - int var14 = GrandExchangeEvents.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - ServerBuild.scene.removeBoundaryObject(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3621(var2, var3, var15, var16, var13.boolean1); - } + 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; } - if (var1 == 1) { - ServerBuild.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - ServerBuild.scene.removeGameObject(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; + 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; } - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { - ServerBuild.scene.removeFloorDecoration(var0, var2, var3); - var13 = Occluder.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3624(var2, var3); + if (var7 == 2) { + var3.field1011 = 0; } + } 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; } } - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; + 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; } - - ArchiveLoader.method1168(var0, var12, var2, var3, var4, var5, var6, ServerBuild.scene, Client.collisionMaps[var0]); - } - } - - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "683461450" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - GraphicsObject.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; - if (var8 >= var10) { - if (var4 != -1L) { - var8 = GrandExchangeEvent.method96(var4); - int var9 = class14.method169(var4); - Player var25 = Client.players[Client.combatTargetPlayerIndex]; - class191.addPlayerToMenu(var25, Client.combatTargetPlayerIndex, var8, var9); - } - - return; } - long var11 = VertexNormal.method3063(var8); - if (var11 != var6) { - label324: { - var6 = var11; - int var13 = GrandExchangeOffer.method128(var8); - int var14 = class43.method816(var8); - int var15 = Tile.method2926(ViewportMouse.ViewportMouse_entityTags[var8]); - int var17 = GrandExchangeEvents.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var18 = var17; - if (var15 == 2 && ServerBuild.scene.getObjectFlags(Clock.Client_plane, var13, var14, var11) >= 0) { - ObjectDefinition var19 = Occluder.getObjectDefinition(var17); - if (var19.transforms != null) { - var19 = var19.transform(); - } + 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.readySequence = var3.definition.readySequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; + } - if (var19 == null) { - break label324; - } + if ((var4 & 8) != 0) { + var3.targetIndex = var0.readUnsignedShort(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } - if (Client.isItemSelected == 1) { - GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(65535) + var19.name, 1, var17, var13, var14); - } else if (Client.isSpellSelected) { - if ((NetSocket.selectedSpellFlags & 4) == 4) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(65535) + var19.name, 2, var17, var13, var14); - } + 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 { - String[] var20 = var19.actions; - if (var20 != null) { - for (int var21 = 4; var21 >= 0; --var21) { - if (var20[var21] != null) { - short var22 = 0; - if (var21 == 0) { - var22 = 3; - } - - if (var21 == 1) { - var22 = 4; - } - - if (var21 == 2) { - var22 = 5; - } - - if (var21 == 3) { - var22 = 6; - } - - if (var21 == 4) { - var22 = 1001; - } - - GraphicsObject.insertMenuItemNoShift(var20[var21], PacketWriter.colorStartTag(65535) + var19.name, var22, var18, var13, var14); - } - } - } - - GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); + var7 = -1; } + + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); } + } - Player var23; - NPC var26; - int var27; - int var34; - int[] var35; - if (var15 == 1) { - NPC var30 = Client.npcs[var18]; - if (var30 == null) { - break label324; - } - - if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var26 = Client.npcs[Client.npcIndices[var27]]; - if (var26 != null && var26 != var30 && var26.definition.size == 1 && var26.x == var30.x && var30.y == var26.y) { - HorizontalAlignment.addNpcToMenu(var26.definition, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var35 = Players.Players_indices; - - for (var34 = 0; var34 < var27; ++var34) { - var23 = Client.players[var35[var34]]; - if (var23 != null && var23.x == var30.x && var23.y == var30.y) { - class191.addPlayerToMenu(var23, var35[var34], var13, var14); - } - } - } - - HorizontalAlignment.addNpcToMenu(var30.definition, var18, var13, var14); - } - - if (var15 == 0) { - Player var31 = Client.players[var18]; - if (var31 == null) { - break label324; - } - - if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var27 = 0; var27 < Client.npcCount; ++var27) { - var26 = Client.npcs[Client.npcIndices[var27]]; - if (var26 != null && var26.definition.size == 1 && var26.x == var31.x && var26.y == var31.y) { - HorizontalAlignment.addNpcToMenu(var26.definition, Client.npcIndices[var27], var13, var14); - } - } - - var27 = Players.Players_count; - var35 = Players.Players_indices; - - for (var34 = 0; var34 < var27; ++var34) { - var23 = Client.players[var35[var34]]; - if (var23 != null && var31 != var23 && var23.x == var31.x && var31.y == var23.y) { - class191.addPlayerToMenu(var23, var35[var34], var13, var14); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { - class191.addPlayerToMenu(var31, var18, var13, var14); + 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); } else { - var4 = var11; - } - } - - if (var15 == 3) { - NodeDeque var33 = Client.groundItems[Clock.Client_plane][var13][var14]; - if (var33 != null) { - for (TileItem var32 = (TileItem)var33.first(); var32 != null; var32 = (TileItem)var33.next()) { - ItemDefinition var36 = HealthBarDefinition.ItemDefinition_get(var32.id); - if (Client.isItemSelected == 1) { - GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var36.name, 16, var32.id, var13, var14); - } else if (Client.isSpellSelected) { - if ((NetSocket.selectedSpellFlags & 1) == 1) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var36.name, 17, var32.id, var13, var14); - } - } else { - String[] var28 = var36.groundActions; - - for (int var29 = 4; var29 >= 0; --var29) { - if (var28 != null && var28[var29] != null) { - byte var24 = 0; - if (var29 == 0) { - var24 = 18; - } - - if (var29 == 1) { - var24 = 19; - } - - if (var29 == 2) { - var24 = 20; - } - - if (var29 == 3) { - var24 = 21; - } - - if (var29 == 4) { - var24 = 22; - } - - GraphicsObject.insertMenuItemNoShift(var28[var29], PacketWriter.colorStartTag(16748608) + var36.name, var24, var32.id, var13, var14); - } else if (var29 == 2) { - GraphicsObject.insertMenuItemNoShift("Take", PacketWriter.colorStartTag(16748608) + var36.name, 20, var32.id, var13, var14); - } - } - - GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16748608) + var36.name, 1004, var32.id, var13, var14); - } - } + var3.removeHealthBar(var8); } } } } - ++var8; - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - signature = "([Lhn;IB)V", - garbageValue = "2" - ) - @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) { - class226.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - class4.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = Varps.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; - class4.runScriptEvent(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]; } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 65fc1d8c1f..e021130e9a 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -3,57 +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("aa") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("qx") + @ObfuscatedName("ag") + @Export("client") @ObfuscatedSignature( - signature = "Ldj;" + signature = "Lclient;" ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("dx") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("ek") - static int[] field295; - @ObfuscatedName("c") + static Client client; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1032814753 + intValue = 1637377849 ) @Export("minPlane") int minPlane; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 161851669 + intValue = -1999475083 ) @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1056408349 + intValue = -1574888169 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1194427309 + intValue = -1761506511 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -27645919 + intValue = -2112462573 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -290110331 + intValue = 731154353 ) @Export("regionEndY") int regionEndY; @@ -61,10 +54,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1034100543" + signature = "(Las;I)V", + garbageValue = "1890497148" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -86,10 +79,10 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-110" + signature = "(IIII)Z", + garbageValue = "-65934716" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -100,35 +93,35 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "37" + signature = "(III)Z", + garbageValue = "-240937232" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-96920779" + garbageValue = "1656767825" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.regionEndX * 64 - this.regionStartX * 64 + var2, var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)Lhj;", - garbageValue = "911083222" + garbageValue = "-226825052" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -136,15 +129,15 @@ public class WorldMapSection1 implements WorldMapSection { return null; } else { int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; - int var4 = this.regionStartY * 64 - this.regionEndY * 64 + var2; + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "76" + signature = "(Lkb;I)V", + garbageValue = "-1393433755" ) @Export("read") public void read(Buffer var1) { @@ -157,254 +150,683 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1927273541" + garbageValue = "-1986942295" ) @Export("postRead") void postRead() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;IIB)Llt;", - garbageValue = "-81" + signature = "(IIIB)I", + garbageValue = "-1" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !class228.method4199(var0, var1, var2) ? null : PendingSpawn.method1738(); + 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; + } } - @ObfuscatedName("gq") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-301044323" + signature = "(ILce;ZB)I", + garbageValue = "-116" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - GrandExchangeOfferUnitPriceComparator.method141(); - if (Client.renderSelf) { - class51.addPlayerToScene(class192.localPlayer, false); - } - - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class51.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - ItemContainer.addNpcsToScene(true); - WorldMapData_1.method733(); - ItemContainer.addNpcsToScene(false); - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { - if (var4.plane == Clock.Client_plane && Client.cycle <= var4.cycleEnd) { - if (Client.cycle >= var4.cycleStart) { - if (var4.targetIndex > 0) { - NPC var20 = Client.npcs[var4.targetIndex - 1]; - if (var20 != null && var20.x >= 0 && var20.x < 13312 && var20.y >= 0 && var20.y < 13312) { - var4.setDestination(var20.x, var20.y, WorldMapSectionType.getTileHeight(var20.x, var20.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { - var6 = -var4.targetIndex - 1; - Player var22; - if (var6 == Client.localPlayerIndex) { - var22 = class192.localPlayer; - } else { - var22 = Client.players[var6]; - } - - if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { - var4.setDestination(var22.x, var22.y, WorldMapSectionType.getTileHeight(var22.x, var22.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field707); - ServerBuild.scene.drawEntity(Clock.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); - } - } else { - var4.remove(); - } - } - - Tiles.method1156(); - GrandExchangeOfferUnitPriceComparator.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var5; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var14; - int var19; - if (!Client.isCameraLocked) { - var19 = Client.camAngleX; - if (Client.field818 / 256 > var19) { - var19 = Client.field818 / 256; - } - - if (Client.field775[4] && Client.field699[4] + 128 > var19) { - var19 = Client.field699[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = PendingSpawn.oculusOrbFocalPointX; - var7 = WorldMapSectionType.field166; - var8 = Skeleton.oculusOrbFocalPointY; - var9 = var19 * 3 + 600; - var10 = Canvas.method864(var9, var3); - var11 = 2048 - var19 & 2047; - var12 = 2048 - var5 & 2047; - int var13 = 0; - var14 = 0; - int var15 = var10; - int var16; - int var17; - int var18; - if (var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var17 * var14 - var10 * var16 >> 16; - var15 = var16 * var14 + var17 * var10 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var17 * var13 + var15 * var16 >> 16; - var15 = var15 * var17 - var13 * var16 >> 16; - var13 = var18; - } - - HitSplatDefinition.cameraX = var6 - var13; - class51.cameraY = var7 - var14; - Actor.cameraZ = var8 - var15; - GrandExchangeOffer.cameraPitch = var19; - FriendSystem.cameraYaw = var5; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (PendingSpawn.oculusOrbFocalPointX >> 7 != class192.localPlayer.x >> 7 || Skeleton.oculusOrbFocalPointY >> 7 != class192.localPlayer.y >> 7)) { - var16 = class192.localPlayer.plane; - var17 = Messages.baseX * 64 + (PendingSpawn.oculusOrbFocalPointX >> 7); - var18 = Language.baseY * 64 + (Skeleton.oculusOrbFocalPointY >> 7); - WorldMapRegion.method563(var17, var18, var16, true); - } - } - - if (!Client.isCameraLocked) { - var19 = class96.method2346(); - } else { - if (WorldMapSection2.clientPreferences.roofsHidden) { - var5 = Clock.Client_plane; - } else { - var6 = WorldMapSectionType.getTileHeight(HitSplatDefinition.cameraX, Actor.cameraZ, Clock.Client_plane); - if (var6 - class51.cameraY < 800 && (Tiles.Tiles_renderFlags[Clock.Client_plane][HitSplatDefinition.cameraX >> 7][Actor.cameraZ >> 7] & 4) != 0) { - var5 = Clock.Client_plane; + 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 { - var5 = 3; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; } + + return 1; + } else { + return 2; } - - var19 = var5; - } - - var5 = HitSplatDefinition.cameraX; - var6 = class51.cameraY; - var7 = Actor.cameraZ; - var8 = GrandExchangeOffer.cameraPitch; - var9 = FriendSystem.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field775[var10]) { - var11 = (int)(Math.random() * (double)(Client.field892[var10] * 2 + 1) - (double)Client.field892[var10] + Math.sin((double)Client.field895[var10] * ((double)Client.field894[var10] / 100.0D)) * (double)Client.field699[var10]); - if (var10 == 0) { - HitSplatDefinition.cameraX += var11; - } - - if (var10 == 1) { - class51.cameraY += var11; - } - - if (var10 == 2) { - Actor.cameraZ += var11; - } - - if (var10 == 3) { - FriendSystem.cameraYaw = var11 + FriendSystem.cameraYaw & 2047; - } - - if (var10 == 4) { - GrandExchangeOffer.cameraPitch += var11; - if (GrandExchangeOffer.cameraPitch < 128) { - GrandExchangeOffer.cameraPitch = 128; - } - - if (GrandExchangeOffer.cameraPitch > 383) { - GrandExchangeOffer.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - Message.method1246(var10 - var0, var11 - var1); } else { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - - UserComparator3.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - UserComparator3.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - ServerBuild.scene.draw(HitSplatDefinition.cameraX, class51.cameraY, Actor.cameraZ, GrandExchangeOffer.cameraPitch, FriendSystem.cameraYaw, var19); - Rasterizer3D.Rasterizer3D_zoom = var12; - UserComparator3.playPcmPlayers(); - ServerBuild.scene.clearTempGameObjects(); - class208.method4017(var0, var1, var2, var3); - if (Client.hintArrowType == 2) { - MouseRecorder.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - Messages.baseX * 64 << 7), (Client.hintArrowY - Language.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - SecureRandomCallable.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + 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] = ""; } - } - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field707); - RouteStrategy.method3662(var0, var1, var2, var3); - HitSplatDefinition.cameraX = var5; - class51.cameraY = var6; - Actor.cameraZ = var7; - GrandExchangeOffer.cameraPitch = var8; - FriendSystem.cameraYaw = var9; - if (Client.isLoading) { - byte var21 = 0; - var14 = var21 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if (var14 == 0) { - Client.isLoading = false; + return 1; + } + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "(Lcw;IIIIII)V", + garbageValue = "-1464461419" + ) + @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; + } } - } - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class197.drawLoadingMessage("Loading - please wait.", false); - } + 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); + } + } + } + } + } + } + + } } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 74b0cd237e..1c62830f9f 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,110 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("at") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("sp") - @ObfuscatedSignature( - signature = "Lbj;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("ea") + @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = 1716794499 + intValue = 1088959325 ) - @Export("port3") - static int port3; - @ObfuscatedName("c") + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 62157229 + intValue = 108027763 ) @Export("minPlane") int minPlane; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 808318479 + intValue = -970262457 ) @Export("planes") int planes; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 521626037 + intValue = 1813632253 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 694874349 + intValue = 460883399 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 316477089 + intValue = -2027857729 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 911714159 + intValue = -848152655 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1254748989 + intValue = -2043506095 ) - int field214; - @ObfuscatedName("l") + int field232; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 389719751 + intValue = -1803971443 ) - int field216; - @ObfuscatedName("j") + int field239; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -363427247 + intValue = 1772744581 ) - int field215; - @ObfuscatedName("m") + int field234; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 467774707 + intValue = -1804974207 ) - int field217; + int field241; WorldMapSection2() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1034100543" + signature = "(Las;I)V", + garbageValue = "1890497148" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field214) { - var1.regionLowX = this.field214; + if (var1.regionLowX > this.field232) { + var1.regionLowX = this.field232; } - if (var1.regionHighX < this.field215) { - var1.regionHighX = this.field215; + if (var1.regionHighX < this.field234) { + var1.regionHighX = this.field234; } - if (var1.regionLowY > this.field216) { - var1.regionLowY = this.field216; + if (var1.regionLowY > this.field239) { + var1.regionLowY = this.field239; } - if (var1.regionHighY < this.field217) { - var1.regionHighY = this.field217; + if (var1.regionHighY < this.field241) { + var1.regionHighY = this.field241; } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-110" + signature = "(IIII)Z", + garbageValue = "-65934716" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -118,51 +112,51 @@ public class WorldMapSection2 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "37" + signature = "(III)Z", + garbageValue = "-240937232" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field214 && var1 >> 6 <= this.field215 && var2 >> 6 >= this.field216 && var2 >> 6 <= this.field217; + return var1 >> 6 >= this.field232 && var1 >> 6 <= this.field234 && var2 >> 6 >= this.field239 && var2 >> 6 <= this.field241; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-96920779" + garbageValue = "1656767825" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.field214 * 64 - this.regionStartX * 64 + var2, var3 + (this.field216 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field232 * 64 - this.regionStartX * 64), var3 + (this.field239 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)Lhj;", - garbageValue = "911083222" + garbageValue = "-226825052" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field214 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field216 * 64 + var2; + int var3 = this.regionStartX * 64 - this.field232 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field239 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "76" + signature = "(Lkb;I)V", + garbageValue = "-1393433755" ) @Export("read") public void read(Buffer var1) { @@ -172,133 +166,66 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field214 = var1.readUnsignedShort(); - this.field216 = var1.readUnsignedShort(); - this.field215 = var1.readUnsignedShort(); - this.field217 = var1.readUnsignedShort(); + this.field232 = var1.readUnsignedShort(); + this.field239 = var1.readUnsignedShort(); + this.field234 = var1.readUnsignedShort(); + this.field241 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1425625159" + garbageValue = "-1585844448" ) @Export("postRead") void postRead() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lio;", - garbageValue = "-1814151694" + signature = "(I)[Lgh;", + garbageValue = "-615033295" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + 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" + ) + @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 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectDefinition(); + var1.id = var0; if (var2 != null) { var1.decode(new Buffer(var2)); } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1693295942" + signature = "(CI)Z", + garbageValue = "65280" ) - public static void method342() { - VarbitDefinition.VarbitDefinition_cached.clear(); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1579745096" - ) - static int method340(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1868356098" - ) - static void method344() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - Tiles.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1 = class30.method567(); - int var0; - if (0L == var1) { - var0 = 5; - } else { - var0 = GraphicsObject.method2060(var1, Login.Login_username); - } - - switch(var0) { - case 2: - Tiles.setLoginResponseString(Strings.field3036, Strings.field3037, Strings.field2933); - Login.loginIndex = 6; - break; - case 3: - Tiles.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - Tiles.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - Tiles.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - Tiles.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - Tiles.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("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "11" - ) - public static String method321(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; + static boolean method433(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index b8af43c4ff..2e1ffe148f 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -3,54 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("f") +@ObfuscatedName("ap") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lf;" + signature = "Lap;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(0, (byte)0), - @ObfuscatedName("t") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lf;" + signature = "Lap;" ) @Export("WORLDMAPSECTIONTYPE1") WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lf;" + signature = "Lap;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(3, (byte)2), - @ObfuscatedName("e") + WORLDMAPSECTIONTYPE2(0, (byte)2), + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lf;" + signature = "Lap;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(1, (byte)3); - @ObfuscatedName("pv") - @ObfuscatedSignature( - signature = "Lkx;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("hq") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1689470585 - ) - static int field166; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 262125779 + intValue = -27254411 ) @Export("type") final int type; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("id") final byte id; @@ -59,73 +47,164 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)[Lf;", - garbageValue = "-3096" + signature = "(I)[Lap;", + garbageValue = "-1086432793" ) - static WorldMapSectionType[] method249() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1}; + static WorldMapSectionType[] method345() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE3}; } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "84077862" + signature = "(III)V", + garbageValue = "1841927686" ) - public static byte[] method250(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; + @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); } - @ObfuscatedName("ac") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "637615278" + signature = "(II)I", + garbageValue = "-1148353199" ) - static int method245(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; + 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("hi") + @ObfuscatedName("hd") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "1" + signature = "(Lbw;B)V", + garbageValue = "80" ) - @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; + 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); + } + + 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); } - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 + (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var9 * var7 + var8 * (128 - var7) >> 7; - } else { - return 0; + 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 a9d64bc7a9..4151c8de35 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,24 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("am") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("rc") - @ObfuscatedGetter( - intValue = -936631043 - ) - static int field240; - @ObfuscatedName("p") + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "Lli;" + signature = "Lih;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("t") + @Export("archive3") + static Archive archive3; + @ObfuscatedName("m") @Export("tileColors") final int[] tileColors; @@ -30,22 +24,75 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "35" + signature = "(III)I", + garbageValue = "1469556779" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var1 + var2 * 64]; } - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkp;IS)V", - garbageValue = "-20256" + signature = "(II)Lce;", + garbageValue = "1891668899" ) - public static void method427(Buffer var0, int var1) { + @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) { + return null; + } else { + var1 = SecureRandomCallable.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-173221436" + ) + 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]; + } + } + } + } + + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Lkb;II)V", + garbageValue = "-1583850141" + ) + public static void method510(Buffer var0, int var1) { if (JagexCache.JagexCache_randomDat != null) { try { JagexCache.JagexCache_randomDat.seek(0L); @@ -56,19 +103,37 @@ public final class WorldMapSprite { } - @ObfuscatedName("gb") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "96" + signature = "(B)[Lla;", + garbageValue = "10" ) - static final void method434() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - ScriptFrame.updateActorSequence(var2, var2.definition.size); + 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]; } } + 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 4dae57b1ab..d9d07e965b 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("ef") +@ObfuscatedName("fw") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("get") abstract Object get(); - @ObfuscatedName("t") + @ObfuscatedName("m") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 3fadc3f6a0..d5dd7a2d4d 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("c") +@ObfuscatedName("x") public interface class0 { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkp;B)V", - garbageValue = "95" + signature = "(Ljava/lang/Object;Lkb;B)V", + garbageValue = "3" ) - void vmethod55(Object var1, Buffer var2); + void vmethod64(Object var1, Buffer var2); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/Object;", - garbageValue = "1665636232" + signature = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1146837249" ) - Object vmethod53(Buffer var1); + Object vmethod74(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 2dd4ac2a29..f6969271bf 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -2,56 +2,78 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("m") final class class1 implements class0 { - @ObfuscatedName("fe") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lko;" + signature = "(Ljava/lang/Object;Lkb;B)V", + garbageValue = "3" ) - @Export("fontBold12") - static Font fontBold12; + public void vmethod64(Object var1, Buffer var2) { + this.method8((Integer)var1, var2); + } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkp;B)V", - garbageValue = "95" + signature = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1146837249" ) - public void vmethod55(Object var1, Buffer var2) { - this.method7((Integer)var1, var2); + public Object vmethod74(Buffer var1) { + return var1.readInt(); } @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/Object;", - garbageValue = "1665636232" + signature = "(Ljava/lang/Integer;Lkb;B)V", + garbageValue = "-6" ) - public Object vmethod53(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkp;I)V", - garbageValue = "-890899410" - ) - void method7(Integer var1, Buffer var2) { + void method8(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lbg;Lbg;IZIZI)I", - garbageValue = "-926800273" + signature = "(II)Ljava/lang/String;", + garbageValue = "1095307790" ) - static int method19(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = MouseHandler.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; + 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); } else { - int var7 = MouseHandler.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; + ScriptEvent.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); } + } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java new file mode 100644 index 0000000000..d01475516a --- /dev/null +++ b/runescape-client/src/main/java/class10.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("s") +public class class10 { + @ObfuscatedName("x") + final int field53; + @ObfuscatedName("m") + final int field54; + @ObfuscatedName("k") + final String field55; + + @ObfuscatedSignature( + signature = "(Lkb;)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; + } + + @ObfuscatedName("m") + int method127() { + return this.field54; + } +} diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java new file mode 100644 index 0000000000..02a76db8aa --- /dev/null +++ b/runescape-client/src/main/java/class105.java @@ -0,0 +1,114 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dd") +public class class105 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Ljm;" + ) + @Export("reflectionChecks") + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("ew") + static int[] field1345; + + static { + reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Liy;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "895690551" + ) + 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); + class74.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; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); + } + } +} diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/class108.java similarity index 68% rename from runescape-client/src/main/java/class99.java rename to runescape-client/src/main/java/class108.java index 57cc6f70f5..f82754aa92 100644 --- a/runescape-client/src/main/java/class99.java +++ b/runescape-client/src/main/java/class108.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") -public interface class99 { - @ObfuscatedName("c") +@ObfuscatedName("dg") +public interface class108 { + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Ldw;", - garbageValue = "-1842325799" + garbageValue = "65536" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java new file mode 100644 index 0000000000..fdd0a48d63 --- /dev/null +++ b/runescape-client/src/main/java/class11.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("p") +public interface class11 { +} diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java new file mode 100644 index 0000000000..6025d3b3a2 --- /dev/null +++ b/runescape-client/src/main/java/class12.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("n") +public interface class12 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lkb;)Lkb;" + ) + Buffer vmethod131(Buffer var1); +} diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 7c810d4259..a435d44bba 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,164 +1,385 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("n") -public class class13 { - @ObfuscatedName("fu") +@ObfuscatedName("u") +public final class class13 { + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lko;" + signature = "Lkb;" ) - @Export("fontPlain12") - static Font fontPlain12; + @Export("NetCache_reference") + public static Buffer NetCache_reference; - @ObfuscatedName("e") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Lkp;IB)V", - garbageValue = "86" + signature = "(ILce;ZI)I", + garbageValue = "1707746438" ) - @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][][]; + 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(); + } - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); + 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; - 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]; + 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] = ""; + } - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } + 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; + } - 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); + 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(); } - } - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = class223.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class223.loadClassFromDescriptor(var20); - if (class223.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = class223.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var17.length == var21.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var17[var19] != var21[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); } - } - var2.arguments[var3] = var10; + 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 { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); + 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; } - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (class223.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class223.loadClassFromDescriptor(var5), var6); + return 1; } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; } } - - class96.reflectionChecks.addFirst(var2); } - @ObfuscatedName("m") + @ObfuscatedName("ek") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "0" + signature = "(I)Lml;", + garbageValue = "637526899" ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "859526666" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - class30.logOut(); - switch(var0) { - case 1: - WorldMapCacheName.method634(); - break; - case 2: - NPC.method2079(); - } - + @Export("getWorldMap") + static WorldMap getWorldMap() { + return GrandExchangeOfferAgeComparator.worldMap; } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java deleted file mode 100644 index 8be41a7aad..0000000000 --- a/runescape-client/src/main/java/class14.java +++ /dev/null @@ -1,162 +0,0 @@ -import java.applet.Applet; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URL; -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("x") -public class class14 { - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1417647521 - ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("aa") - static String field101; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lhx;" - ) - static StudioGame field102; - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "([BB)Llt;", - garbageValue = "-30" - ) - @Export("convertJpgToSprite") - public static final Sprite convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var2 * var3]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new Sprite(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { - } - - return new Sprite(0, 0); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "-1466465553" - ) - static boolean method174(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class51.field431.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var13.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var8) { - return false; - } - } else if (var1 == 1) { - try { - Applet var7 = class51.applet; - Object[] var5 = new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}; - Object var3 = JSObject.getWindow(var7).call(var2, var5); - return var3 != null; - } catch (Throwable var9) { - return false; - } - } else if (var1 == 2) { - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var10) { - return false; - } - } else if (var1 == 3) { - try { - class47.method857(class51.applet, "loggedout"); - } catch (Throwable var12) { - } - - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var11) { - return false; - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("d") - public static int method169(long var0) { - return (int)(var0 >>> 7 & 127L); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "1" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "(IZIB)V", - garbageValue = "14" - ) - public static final void method173(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.field1398 = var0; - PcmPlayer.PcmPlayer_stereo = var1; - GrandExchangeEvent.field45 = var2; - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("fs") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "970365805" - ) - static int method170() { - 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.field813; - } else { - return 10000; - } - } -} diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java deleted file mode 100644 index 2152bae502..0000000000 --- a/runescape-client/src/main/java/class146.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ev") -public interface class146 { - @ObfuscatedName("c") - void method3397(Object var1); -} diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java new file mode 100644 index 0000000000..0f8680f2f2 --- /dev/null +++ b/runescape-client/src/main/java/class155.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("es") +public interface class155 { + @ObfuscatedName("x") + void method3442(Object var1); +} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java deleted file mode 100644 index c4fd68f48e..0000000000 --- a/runescape-client/src/main/java/class16.java +++ /dev/null @@ -1,38 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("k") -public class class16 { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "Lbt;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lii;Ljava/lang/String;Ljava/lang/String;I)Lli;", - garbageValue = "1833648793" - ) - @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 (!class228.method4199(var0, var3, var4)) { - var5 = null; - } else { - var5 = class313.method5962(); - } - - return var5; - } -} diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java deleted file mode 100644 index e153eac76d..0000000000 --- a/runescape-client/src/main/java/class160.java +++ /dev/null @@ -1,129 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fn") -public enum class160 implements Enumerated { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lfn;" - ) - field1994(1, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lfn;" - ) - field1996(0, 1), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lfn;" - ) - field1993(2, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lfn;" - ) - field1995(3, 3); - - @ObfuscatedName("f") - public static String field1998; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1846550889 - ) - public final int field1992; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -699786639 - ) - @Export("id") - final int id; - - class160(int var3, int var4) { - this.field1992 = var3; - this.id = var4; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "([BIILem;[Lfv;I)V", - garbageValue = "1777636596" - ) - static final void method3518(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.method5589(); - 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]; - } - - ArchiveDiskActionHandler.method4336(var12, var16, var17, var6, var15, var14, var3, var19); - } - } - } - } - - @ObfuscatedName("id") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-115001383" - ) - @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/class161.java b/runescape-client/src/main/java/class161.java deleted file mode 100644 index 6256665098..0000000000 --- a/runescape-client/src/main/java/class161.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fh") -public interface class161 { -} diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java deleted file mode 100644 index 01eec8f080..0000000000 --- a/runescape-client/src/main/java/class162.java +++ /dev/null @@ -1,37 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fb") -public class class162 implements class161 { - @ObfuscatedName("sy") - @ObfuscatedGetter( - intValue = -1885571545 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lii;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-1967656766" - ) - public static void method3523(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = var0; - class197.musicTrackGroupId = var5; - class83.musicTrackFileId = var6; - AttackOption.musicTrackVolume = var3; - KeyHandler.musicTrackBoolean = var4; - class197.field2412 = 10000; - } -} diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java new file mode 100644 index 0000000000..c626fa93fd --- /dev/null +++ b/runescape-client/src/main/java/class169.java @@ -0,0 +1,185 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fu") +public enum class169 implements Enumerated { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lfu;" + ) + field2012(0, 0), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lfu;" + ) + field2007(1, 1), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lfu;" + ) + field2008(3, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lfu;" + ) + field2006(2, 3); + + @ObfuscatedName("z") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("gf") + @ObfuscatedSignature( + signature = "[Lle;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1763845437 + ) + public final int field2014; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1800480151 + ) + @Export("id") + final int id; + + class169(int var3, int var4) { + this.field2014 = var3; + this.id = var4; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "56" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("x") + public static final void method3541(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 new file mode 100644 index 0000000000..c80fb31e67 --- /dev/null +++ b/runescape-client/src/main/java/class170.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ft") +public interface class170 { +} diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java new file mode 100644 index 0000000000..e85562e9d8 --- /dev/null +++ b/runescape-client/src/main/java/class171.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("fj") +public class class171 implements class170 { + @ObfuscatedName("r") + public static String field2016; +} diff --git a/runescape-client/src/main/java/class173.java b/runescape-client/src/main/java/class173.java deleted file mode 100644 index 7dcfe2e81b..0000000000 --- a/runescape-client/src/main/java/class173.java +++ /dev/null @@ -1,51 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fo") -public class class173 { - @ObfuscatedName("o") - @Export("directions") - public static int[][] directions; - @ObfuscatedName("e") - @Export("distances") - public static int[][] distances; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1572714133 - ) - public static int field2093; - @ObfuscatedName("l") - @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("j") - @Export("bufferY") - public static int[] bufferY; - - static { - directions = new int[128][128]; - distances = new int[128][128]; - bufferX = new int[4096]; - bufferY = new int[4096]; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1943215083" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } -} diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java deleted file mode 100644 index 35def35f81..0000000000 --- a/runescape-client/src/main/java/class181.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fr") -public interface class181 { -} diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java new file mode 100644 index 0000000000..5c646e4b43 --- /dev/null +++ b/runescape-client/src/main/java/class182.java @@ -0,0 +1,42 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gg") +public class class182 { + @ObfuscatedName("k") + @Export("directions") + public static int[][] directions; + @ObfuscatedName("d") + @Export("distances") + public static int[][] distances; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1538364035 + ) + public static int field2097; + @ObfuscatedName("z") + @Export("bufferX") + public static int[] bufferX; + @ObfuscatedName("t") + @Export("bufferY") + public static int[] bufferY; + + static { + directions = new int[128][128]; + distances = new int[128][128]; + 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/class185.java b/runescape-client/src/main/java/class185.java deleted file mode 100644 index 0a407a04b2..0000000000 --- a/runescape-client/src/main/java/class185.java +++ /dev/null @@ -1,139 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gy") -public class class185 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2327; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2315; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2322; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2317; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2318; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2320; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2319; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2314; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2316; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgy;" - ) - public static final class185 field2323; - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "Lhn;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - - static { - field2327 = new class185(5); - field2315 = new class185(7); - field2322 = new class185(3); - field2317 = new class185(5); - field2318 = new class185(15); - field2320 = new class185(14); - field2319 = new class185(6); - field2314 = new class185(2); - field2316 = new class185(4); - field2323 = new class185(4); - } - - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "5" - ) - class185(int var1) { - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Llp;IIB)I", - garbageValue = "-67" - ) - static int method3686(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; - } - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - signature = "(Lbx;I)V", - garbageValue = "-46568974" - ) - static final void method3685(Actor var0) { - int var1 = Math.max(1, var0.field985 - Client.cycle); - int var2 = var0.field981 * 128 + var0.field942 * 2013925376; - int var3 = var0.field957 * 128 + var0.field942 * 2013925376; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field997 = 0; - var0.orientation = var0.field987; - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - signature = "(Lbe;ZI)V", - garbageValue = "1102320238" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - ObjectSound.method1933(var2); - } - - AbstractWorldMapIcon.method628(var2); - Widget var4 = Varps.getWidget(var3); - if (var4 != null) { - NPCDefinition.invalidateWidget(var4); - } - - GameObject.method3360(); - if (Client.rootInterface != -1) { - class226.runIntfCloseListeners(Client.rootInterface, 1); - } - - } -} diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java deleted file mode 100644 index 49de8ad3fe..0000000000 --- a/runescape-client/src/main/java/class186.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ga") -public class class186 { - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lhn;" - ) - static Widget field2331; -} diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java deleted file mode 100644 index 6f192e315a..0000000000 --- a/runescape-client/src/main/java/class188.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gm") -public class class188 { - @ObfuscatedName("rg") - @ObfuscatedGetter( - intValue = -1778980480 - ) - static int field2346; - @ObfuscatedName("c") - static int[] field2344; - - static { - new Object(); - field2344 = new int[33]; - field2344[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2344[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "568041026" - ) - static void method3708() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); - } - } - - } -} diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java deleted file mode 100644 index 29416800a8..0000000000 --- a/runescape-client/src/main/java/class189.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gn") -public class class189 { - @ObfuscatedName("dz") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("ei") - @ObfuscatedGetter( - intValue = -1965568453 - ) - static int field2353; -} diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java new file mode 100644 index 0000000000..6fa0fef623 --- /dev/null +++ b/runescape-client/src/main/java/class190.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("gc") +public interface class190 { +} diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java deleted file mode 100644 index 1e090882ac..0000000000 --- a/runescape-client/src/main/java/class191.java +++ /dev/null @@ -1,122 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gx") -public class class191 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgx;" - ) - static final class191 field2370; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgx;" - ) - static final class191 field2368; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgx;" - ) - static final class191 field2373; - - static { - field2370 = new class191(); - field2368 = new class191(); - field2373 = new class191(); - } - - class191() { - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - signature = "(Lba;IIII)V", - garbageValue = "-390194357" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class192.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 = class192.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = PacketWriter.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = PacketWriter.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = PacketWriter.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = PacketWriter.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = PacketWriter.colorStartTag(65280); - } else if (var9 > 6) { - var6 = PacketWriter.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = PacketWriter.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = PacketWriter.colorStartTag(12648192); - } else { - var6 = PacketWriter.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) { - GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((NetSocket.selectedSpellFlags & 8) == 8) { - GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class192.localPlayer.combatLevel) { - var11 = 2000; - } - - if (class192.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class192.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; - } - - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - GraphicsObject.insertMenuItemNoShift(Client.playerMenuActions[var10], PacketWriter.colorStartTag(16777215) + var4, var7, var1, var2, var3); - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = PacketWriter.colorStartTag(16777215) + var4; - break; - } - } - - } - } - } -} diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java deleted file mode 100644 index 8e098970e0..0000000000 --- a/runescape-client/src/main/java/class192.java +++ /dev/null @@ -1,190 +0,0 @@ -import java.util.HashSet; -import java.util.Set; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gp") -public enum class192 implements Enumerated { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2380("", 0, new class191[]{class191.field2373}), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2375("", 1, new class191[]{class191.field2368, class191.field2373}), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2376("", 2, new class191[]{class191.field2368, class191.field2370, class191.field2373}), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2382("", 3, new class191[]{class191.field2368}), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2378("", 4), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2379("", 5, new class191[]{class191.field2368, class191.field2373}), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2377("", 6, new class191[]{class191.field2373}), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2390("", 8, new class191[]{class191.field2368, class191.field2373}), - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2384("", 9, new class191[]{class191.field2368, class191.field2370}), - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2383("", 10, new class191[]{class191.field2368}), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2395("", 11, new class191[]{class191.field2368}), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2385("", 12, new class191[]{class191.field2368, class191.field2373}), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgp;" - ) - field2374("", 13, new class191[]{class191.field2368}); - - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lmv;" - ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("gc") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("jy") - @ObfuscatedSignature( - signature = "Lba;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1568676187 - ) - @Export("id") - final int id; - @ObfuscatedName("x") - final Set field2388; - - static { - method3732(); - } - - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgx;)V" - ) - class192(String var3, int var4, class191[] var5) { - this.field2388 = new HashSet(); - this.id = var4; - class191[] var6 = var5; - - for (int var7 = 0; var7 < var6.length; ++var7) { - class191 var8 = var6[var7]; - this.field2388.add(var8); - } - - } - - class192(String var3, int var4) { - this.field2388 = new HashSet(); - this.id = var4; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)[Lgp;", - garbageValue = "39" - ) - static class192[] method3732() { - return new class192[]{field2376, field2390, field2378, field2395, field2382, field2383, field2377, field2375, field2385, field2380, field2379, field2384, field2374}; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Lhn;II)V", - garbageValue = "558596528" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2702 == null) { - throw new RuntimeException(); - } else { - if (var0.field2711 == null) { - var0.field2711 = new int[var0.field2702.length]; - } - - var0.field2711[var1] = Integer.MAX_VALUE; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1858643445" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } -} diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java new file mode 100644 index 0000000000..caa08889e5 --- /dev/null +++ b/runescape-client/src/main/java/class194.java @@ -0,0 +1,85 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gh") +public class class194 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2324; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2325; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgh;" + ) + 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; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2329; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2330; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2331; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgh;" + ) + public static final class194 field2323; + + 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); + } + + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "14" + ) + 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 f2dd873587..42f00749b4 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,9 +1,43 @@ -import java.util.HashMap; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gm") public class class195 { - static { - new HashMap(); + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(IIIIB)I", + garbageValue = "90" + ) + 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); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lhe;IS)V", + garbageValue = "-23676" + ) + @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]; + } + + var0.field2706[var1] = Integer.MAX_VALUE; + } + } + + @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 7528328297..045dd7574d 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -1,131 +1,24 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gs") public class class197 { - @ObfuscatedName("og") - @ObfuscatedSignature( - signature = "Lcu;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("musicPatchesArchive") - static AbstractArchive musicPatchesArchive; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("musicSamplesArchive") - static AbstractArchive musicSamplesArchive; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgw;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1658116117 - ) - public static int field2414; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1762609869 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("l") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -623019541 - ) - public static int field2412; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Ldv;" - ) - @Export("soundCache") - public static SoundCache soundCache; + @ObfuscatedName("x") + static int[] field2350; + @ObfuscatedName("w") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; static { - field2414 = 0; - } + new Object(); + field2350 = new int[33]; + field2350[0] = 0; + int var0 = 2; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IIII)Lce;", - garbageValue = "473257926" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; - Script var5 = MilliClock.method3529(var3, var0); - if (var5 != null) { - return var5; - } else { - int var4 = class210.method4029(var2, var0); - var5 = MilliClock.method3529(var4, var0); - return var5 != null ? var5 : null; + for (int var1 = 1; var1 < 33; ++var1) { + field2350[var1] = var0 - 1; + var0 += var0; } - } - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "-802729568" - ) - @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 = class13.fontPlain12.lineWidth(var0, 250); - int var6 = class13.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 16777215); - class13.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 = var6 + var2 + var2; - - int var11; - for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { - Client.field851[var11] = true; - } - } - - if (var1) { - DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); - } else { - var11 = var3; - int var12 = var4; - int var13 = var5; - int var14 = var6; - - for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { - if (Client.rootWidgetXs[var15] + Client.rootWidgetWidths[var15] > var11 && Client.rootWidgetXs[var15] < var11 + var13 && Client.rootWidgetHeights[var15] + Client.rootWidgetYs[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { - Client.field852[var15] = true; - } - } - } - - } } } diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java new file mode 100644 index 0000000000..237c6101eb --- /dev/null +++ b/runescape-client/src/main/java/class198.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gk") +public class class198 { + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lii;" + ) + static ServerBuild field2353; + + @ObfuscatedName("jk") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "1" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (LoginScreenAnimation.loadInterface(var0)) { + SecureRandomCallable.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + } + } +} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 2f25c9393b..73ea9b8da0 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,414 +1,143 @@ 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("o") +@ObfuscatedName("k") final class class2 implements class0 { - @ObfuscatedName("ql") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lch;" + signature = "(Ljava/lang/Object;Lkb;B)V", + garbageValue = "3" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkp;B)V", - garbageValue = "95" - ) - public void vmethod55(Object var1, Buffer var2) { - this.method21((Long)var1, var2); + public void vmethod64(Object var1, Buffer var2) { + this.method36((Long)var1, var2); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/Object;", - garbageValue = "1665636232" + signature = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1146837249" ) - public Object vmethod53(Buffer var1) { + public Object vmethod74(Buffer var1) { return var1.readLong(); } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkp;I)V", - garbageValue = "-301024958" + signature = "(Ljava/lang/Long;Lkb;I)V", + garbageValue = "1997729156" ) - void method21(Long var1, Buffer var2) { + void method36(Long var1, Buffer var2) { var2.writeLong(var1); } - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Lhq;", - garbageValue = "-1693813120" + signature = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "15" ) - public static ServerBuild method31(int var0) { - ServerBuild[] var1 = WorldMapID.method572(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - ServerBuild var3 = var1[var2]; - if (var0 == var3.field3108) { - return var3; - } + @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); } - - return null; } - @ObfuscatedName("g") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "-115" + signature = "(ILce;ZI)I", + garbageValue = "-453717228" ) - static int method34(int var0, Script var1, boolean var2) { - int var4 = -1; + static int method28(int var0, Script var1, boolean var2) { Widget var3; if (var0 >= 2000) { var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var3 = Varps.getWidget(var4); + var3 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { - var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - class320.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[class320.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[class320.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - class320.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 5]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - NPCDefinition.invalidateWidget(var3); - } - + 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_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - NPCDefinition.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - class320.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - class320.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - NPCDefinition.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - WorldMapAreaData.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - NPCDefinition.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - FillMode var6 = (FillMode)WorldMapSection0.findEnumerated(ClientPreferences.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - NPCDefinition.invalidateWidget(var3); - } - + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = ByteArrayPool.localPlayer.appearance.getChatHeadId(); return 1; } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - var3.field2606 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else { - return 2; - } + return 2; } - } - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "([BB)[B", - garbageValue = "-84" - ) - @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.field3148 != 0 && var3 > AbstractArchive.field3148) { - 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.field3148 == 0 || var6 <= AbstractArchive.field3148)) { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; + 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; } else { - throw new RuntimeException(); + var3.itemQuantityMode = 2; } + + if (var3.field2622 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2622; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; } } - @ObfuscatedName("aq") + @ObfuscatedName("jn") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "26" + signature = "(ZB)V", + garbageValue = "1" ) - protected static final void method24() { - GameShell.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameShell.graphicsTickTimes[var0] = 0L; - } - - for (var0 = 0; var0 < 32; ++var0) { - GameShell.clientTickTimes[var0] = 0L; - } - - Fonts.gameCyclesToDo = 0; + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; } - @ObfuscatedName("fj") + @ObfuscatedName("jl") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-917024322" + signature = "(IIIIIIIB)V", + garbageValue = "16" ) - static void method32() { - Client.mouseLastLastPressedTimeMillis = -1L; - class16.mouseRecorder.index = 0; - GrandExchangeOfferTotalQuantityComparator.hasFocus = true; - Client.hadFocus = true; - Client.field702 = -1L; - GrandExchangeOfferAgeComparator.method162(); - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1309 = null; - Client.packetWriter.field1305 = null; - Client.packetWriter.field1307 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1299 = 0; - Client.rebootTimer = 0; - Client.logoutTimer = 0; - Client.hintArrowType = 0; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - MouseHandler.MouseHandler_idleCycles = 0; - SoundSystem.method2563(); - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - class218.field2716 = null; - Client.minimapState = 0; - Client.field704 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - GrandExchangeOfferOwnWorldComparator.method1308(); - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; + @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); } - - 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(); - KeyHandler.friendSystem.clear(); - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { - VarpDefinition var3 = Messages.VarpDefinition_get(var0); - if (var3 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; - } - } - - class197.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - ObjectSound.method1933(Client.rootInterface); - } - - for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - class185.closeInterface(var4, true); - } - - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.meslayerContinueWidget = null; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var0 = 0; var0 < 8; ++var0) { - Client.playerMenuActions[var0] = null; - Client.playerOptionsPriorities[var0] = false; - } - - WorldMapLabelSize.method198(); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field851[var0] = true; - } - - class238.method4415(); - InterfaceParent.clanChat = null; - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - PendingSpawn.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java new file mode 100644 index 0000000000..16080c6700 --- /dev/null +++ b/runescape-client/src/main/java/class200.java @@ -0,0 +1,67 @@ +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") +public class class200 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgy;" + ) + static final class200 field2369; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgy;" + ) + static final class200 field2371; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgy;" + ) + static final class200 field2370; + @ObfuscatedName("hm") + @ObfuscatedGetter( + intValue = 319009619 + ) + @Export("cameraZ") + static int cameraZ; + + static { + field2369 = new class200(); + field2371 = new class200(); + field2370 = new class200(); + } + + class200() { + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([BI)Lla;", + garbageValue = "1925772237" + ) + @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); + } +} diff --git a/runescape-client/src/main/java/class201.java b/runescape-client/src/main/java/class201.java new file mode 100644 index 0000000000..694c6ee2e8 --- /dev/null +++ b/runescape-client/src/main/java/class201.java @@ -0,0 +1,248 @@ +import java.util.HashSet; +import java.util.Set; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gd") +public enum class201 implements Enumerated { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgd;" + ) + field2375("", 0, new class200[]{class200.field2370}), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgd;" + ) + field2382("", 1, new class200[]{class200.field2371, class200.field2370}), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgd;" + ) + 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}), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgd;" + ) + field2380("", 6, new class200[]{class200.field2370}), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgd;" + ) + 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}), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgd;" + ) + field2385("", 12, new class200[]{class200.field2371, class200.field2370}), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgd;" + ) + field2386("", 13, new class200[]{class200.field2371}); + + @ObfuscatedName("bh") + static String field2390; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1460687895 + ) + @Export("id") + final int id; + @ObfuscatedName("h") + final Set field2388; + + static { + method3753(); + } + + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I[Lgy;)V" + ) + class201(String var3, int var4, class200[] var5) { + this.field2388 = new HashSet(); + this.id = var4; + class200[] var6 = var5; + + for (int var7 = 0; var7 < var6.length; ++var7) { + class200 var8 = var6[var7]; + this.field2388.add(var8); + } + + } + + class201(String var3, int var4) { + this.field2388 = new HashSet(); + this.id = var4; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "56" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)[Lgd;", + garbageValue = "-2096888845" + ) + static class201[] method3753() { + return new class201[]{field2379, field2385, field2386, field2376, field2384, field2380, field2381, field2377, field2378, field2374, field2375, field2382, field2383}; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1010005518" + ) + 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; + } + } +} diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java new file mode 100644 index 0000000000..eac7c4a05a --- /dev/null +++ b/runescape-client/src/main/java/class204.java @@ -0,0 +1,85 @@ +import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gp") +public class class204 { + static { + new HashMap(); + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + signature = "(IIIIZI)V", + garbageValue = "-1868229835" + ) + @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.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; + } +} diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java new file mode 100644 index 0000000000..28394d2a23 --- /dev/null +++ b/runescape-client/src/main/java/class206.java @@ -0,0 +1,65 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gr") +public class class206 { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgi;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -972786961 + ) + public static int field2406; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 11413497 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1578862753 + ) + @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; + + static { + field2406 = 0; + } +} diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java deleted file mode 100644 index fd4ef171b3..0000000000 --- a/runescape-client/src/main/java/class208.java +++ /dev/null @@ -1,486 +0,0 @@ -import java.io.File; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ht") -public class class208 { - @ObfuscatedName("m") - public static short[][] field2514; - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/io/File;B)V", - garbageValue = "16" - ) - public static void method4016(File var0) { - FileSystem.FileSystem_cacheDir = var0; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lks;II)V", - garbageValue = "-1608605247" - ) - @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.field621 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (Language.baseY * 64 + var4.pathY[0] >> 13) + (Messages.baseX * 64 + var4.pathX[0] >> 13 << 14); - if (var4.field967 != -1) { - Players.Players_orientations[var1] = var4.field967; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - class40.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.field621 = false; - } else if (var2) { - var4.field621 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field621 = false; - var4.method1266(var6, var7, Players.field1237[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.field621 = false; - } else if (var2) { - var4.field621 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field621 = false; - var4.method1266(var6, var7, Players.field1237[var1]); - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field621 = false; - } else if (var2) { - var4.field621 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field621 = false; - var4.method1266(var10, var11, Players.field1237[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - Clock.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (Messages.baseX * 64 + var8 + var4.pathX[0] & 16383) - Messages.baseX * 64; - var11 = (Language.baseY * 64 + var9 + var4.pathY[0] & 16383) - Language.baseY * 64; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field621 = false; - } else if (var2) { - var4.field621 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field621 = false; - var4.method1266(var10, var11, Players.field1237[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - Clock.Client_plane = var4.plane; - } - - } - } - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(Lbf;B)V", - garbageValue = "1" - ) - static void method4019(GameShell var0) { - while (SoundSystem.isKeyDown()) { - if (RouteStrategy.field2102 == 13) { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); - return; - } - - if (RouteStrategy.field2102 == 96) { - if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (RouteStrategy.field2102 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class32.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) { - PcmPlayer.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.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) { - PcmPlayer.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.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) { - PcmPlayer.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.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) { - PcmPlayer.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.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) { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = class96.World_worlds[Login.hoveredWorldIndex]; - GrandExchangeEvents.changeWorld(var5); - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeEvent.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapData_1.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapData_1.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && class32.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Username.canvasWidth - class32.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Username.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapData_1.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapData_1.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - - } - - @ObfuscatedName("gc") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "168083732" - ) - static final void method4017(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 == class192.localPlayer) { - var6 = var9; - continue; - } - } else { - var10 = Client.npcs[Client.npcIndices[var9 - var7]]; - } - - class288.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); - } - - if (Client.renderSelf && var6 != -1) { - class288.drawActor2d(class192.localPlayer, var6, var0, var1, var2, var3); - } - - if (var4) { - class288.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] && var19 + var12 > 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.field861[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) { - class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { - class1.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { - class1.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { - class1.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]) * (class1.fontBold12.stringWidth(var20) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - class1.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 - class1.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - } -} diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java deleted file mode 100644 index 6575cc10e7..0000000000 --- a/runescape-client/src/main/java/class210.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hi") -public class class210 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhc;" - ) - @Export("huffman") - static Huffman huffman; - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1848259847" - ) - public static int method4029(int var0, int var1) { - return (var0 + 40000 << 8) + var1; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "11236" - ) - static void method4032(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); - if (var4 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var4); - } - } -} diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java deleted file mode 100644 index efef8ce3b6..0000000000 --- a/runescape-client/src/main/java/class215.java +++ /dev/null @@ -1,181 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("hl") -public class class215 { - @ObfuscatedName("c") - public static final short[] field2552; - @ObfuscatedName("t") - public static final short[][] field2553; - @ObfuscatedName("o") - public static final short[] field2551; - @ObfuscatedName("e") - public static final short[][] field2550; - - static { - field2552 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2553 = 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}}; - field2551 = new short[]{-10304, 9104, -1, -1, -1}; - field2550 = 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("c") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1561173160" - ) - public static boolean method4098(int var0) { - return var0 >= WorldMapDecorationType.field2745.id && var0 <= WorldMapDecorationType.field2743.id || var0 == WorldMapDecorationType.field2731.id; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "694265638" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - Tile.method2927(var0, var1, "openjs", var2); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-329192495" - ) - public static void method4095() { - ParamDefinition.ParamDefinition_cached.clear(); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2141747621" - ) - static void method4101(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1319059426" - ) - static int method4100(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var5 = HealthBarDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - var5 = HealthBarDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = HealthBarDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = HealthBarDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = HealthBarDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - var6 = HealthBarDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - class42.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class162.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - AbstractByteArrayCopier.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (WorldMapData_0.foundItemIds != null && AbstractByteArrayCopier.foundItemIndex < class162.foundItemIdCount) { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_0.foundItemIds[++AbstractByteArrayCopier.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } - } - } -} diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java new file mode 100644 index 0000000000..ea73c9b7be --- /dev/null +++ b/runescape-client/src/main/java/class217.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hw") +public class class217 { + @ObfuscatedName("dd") + @Export("mouseCam") + static boolean mouseCam; + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)J", + garbageValue = "717184533" + ) + @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; + } 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; + } + } + } + + @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) { + return null; + } else { + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; + } + } +} diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java deleted file mode 100644 index 9c8c07f26a..0000000000 --- a/runescape-client/src/main/java/class218.java +++ /dev/null @@ -1,70 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hw") -public class class218 { - @ObfuscatedName("su") - @ObfuscatedSignature( - signature = "Lin;" - ) - public static class238 field2716; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -851382349 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("g") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("j") - static int[] field2718; - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmo;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; - } else { - var2 = new RunException(var0, var1); - } - - return var2; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-77" - ) - static int method4178(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } -} diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java new file mode 100644 index 0000000000..f80c722b9c --- /dev/null +++ b/runescape-client/src/main/java/class219.java @@ -0,0 +1,57 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hd") +public class class219 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lhb;" + ) + @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") + @ObfuscatedSignature( + signature = "(II)Llg;", + garbageValue = "1957450330" + ) + public static PrivateChatMode method4052(int var0) { + PrivateChatMode[] var1 = class300.method5368(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.field3804) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1658769285" + ) + public static void method4057(int var0) { + if (class206.field2406 != 0) { + musicTrackVolume = var0; + } else { + class206.midiPcmStream.setPcmStreamVolume(var0); + } + + } +} diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java new file mode 100644 index 0000000000..8d446462a9 --- /dev/null +++ b/runescape-client/src/main/java/class22.java @@ -0,0 +1,569 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("c") +public class class22 { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "32517854" + ) + @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; + } + } + } + + @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; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var7 + var11 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "257352924" + ) + 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; + } 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) { + class74.method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); + } + + Client.field915 = false; + } + } + + } + + @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.readySequence) { + 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") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-116" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class58.method966(); + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.obj != null) { + var1.set(); + } + } + + 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) { + class74.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; + } +} diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java deleted file mode 100644 index 828106fa20..0000000000 --- a/runescape-client/src/main/java/class222.java +++ /dev/null @@ -1,119 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hg") -public class class222 { - @ObfuscatedName("em") - @ObfuscatedSignature( - signature = "Llj;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - - @ObfuscatedName("fo") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1128427150" - ) - static final void method4192() { - int var2; - int var3; - 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(Client.archive4, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - int[] var14 = Client.queuedSoundEffectDelays; - var14[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { - if (Client.soundLocations[var0] != 0) { - var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - class192.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - class192.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var5 + var7 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; - } else { - var2 = Client.soundEffectVolume; - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(WorldMapSection1.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - class2.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.field881) { - boolean var12; - if (class197.field2414 != 0) { - var12 = true; - } else { - var12 = class197.midiPcmStream.isReady(); - } - - if (!var12) { - if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { - Archive var13 = MouseHandler.archive6; - var2 = Client.currentTrackGroupId; - var3 = Client.musicVolume; - class197.field2414 = 1; - UserComparator5.musicTrackArchive = var13; - class197.musicTrackGroupId = var2; - class83.musicTrackFileId = 0; - AttackOption.musicTrackVolume = var3; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 10000; - } - - Client.field881 = false; - } - } - - } -} diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java deleted file mode 100644 index 382a9073f1..0000000000 --- a/runescape-client/src/main/java/class223.java +++ /dev/null @@ -1,117 +0,0 @@ -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("hy") -public class class223 { - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "118076110" - ) - @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); - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-1273474206" - ) - static int method4193(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - class320.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - EnumDefinition var5 = GameObject.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; - EnumDefinition var10 = GameObject.getEnum(var3); - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - class320.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; - EnumDefinition var7 = GameObject.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[++Message.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } -} diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java new file mode 100644 index 0000000000..622615c8b4 --- /dev/null +++ b/runescape-client/src/main/java/class224.java @@ -0,0 +1,210 @@ +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") +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; + + 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]}; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + garbageValue = "-222701931" + ) + 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); + } 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; + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java deleted file mode 100644 index ea5372d85e..0000000000 --- a/runescape-client/src/main/java/class225.java +++ /dev/null @@ -1,597 +0,0 @@ -import java.io.DataInputStream; -import java.net.URL; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hv") -public class class225 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "1575191798" - ) - @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 = Bounds.method6058(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=" + GZipDecompressor.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + class216.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "48" - ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - ServerBuild.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - WorldMapRectangle.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) { - GrandExchangeEvent.archive0 = class51.newArchive(0, false, true, true); - class65.archive1 = class51.newArchive(1, false, true, true); - GrandExchangeOfferWorldComparator.archive2 = class51.newArchive(2, true, false, true); - class267.archive3 = class51.newArchive(3, false, true, true); - Client.archive4 = class51.newArchive(4, false, true, true); - NetSocket.archive5 = class51.newArchive(5, true, true, true); - MouseHandler.archive6 = class51.newArchive(6, true, true, true); - BuddyRankComparator.archive7 = class51.newArchive(7, false, true, true); - UserComparator8.archive8 = class51.newArchive(8, false, true, true); - GrandExchangeOfferNameComparator.archive9 = class51.newArchive(9, false, true, true); - HealthBar.archive10 = class51.newArchive(10, false, true, true); - GrandExchangeOffer.archive11 = class51.newArchive(11, false, true, true); - MilliClock.archive12 = class51.newArchive(12, false, true, true); - MouseHandler.archive13 = class51.newArchive(13, true, false, true); - class189.archive14 = class51.newArchive(14, false, true, true); - WorldMapSection1.archive15 = class51.newArchive(15, false, true, true); - Client.archive17 = class51.newArchive(17, true, true, true); - UserComparator2.archive18 = class51.newArchive(18, false, true, true); - Clock.archive19 = class51.newArchive(19, false, true, true); - SecureRandomCallable.archive20 = class51.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 var35 = 0; - var0 = var35 + GrandExchangeEvent.archive0.percentage() * 4 / 100; - var0 += class65.archive1.percentage() * 4 / 100; - var0 += GrandExchangeOfferWorldComparator.archive2.percentage() * 2 / 100; - var0 += class267.archive3.percentage() * 2 / 100; - var0 += Client.archive4.percentage() * 6 / 100; - var0 += NetSocket.archive5.percentage() * 4 / 100; - var0 += MouseHandler.archive6.percentage() * 2 / 100; - var0 += BuddyRankComparator.archive7.percentage() * 56 / 100; - var0 += UserComparator8.archive8.percentage() * 2 / 100; - var0 += GrandExchangeOfferNameComparator.archive9.percentage() * 2 / 100; - var0 += HealthBar.archive10.percentage() * 2 / 100; - var0 += GrandExchangeOffer.archive11.percentage() * 2 / 100; - var0 += MilliClock.archive12.percentage() * 2 / 100; - var0 += MouseHandler.archive13.percentage() * 2 / 100; - var0 += class189.archive14.percentage() * 2 / 100; - var0 += WorldMapSection1.archive15.percentage() * 2 / 100; - var0 += Clock.archive19.percentage() / 100; - var0 += UserComparator2.archive18.percentage() / 100; - var0 += SecureRandomCallable.archive20.percentage() / 100; - var0 += Client.archive17.method4372() && Client.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - WorldMapLabel.method438(GrandExchangeEvent.archive0, "Animations"); - WorldMapLabel.method438(class65.archive1, "Skeletons"); - WorldMapLabel.method438(Client.archive4, "Sound FX"); - WorldMapLabel.method438(NetSocket.archive5, "Maps"); - WorldMapLabel.method438(MouseHandler.archive6, "Music Tracks"); - WorldMapLabel.method438(BuddyRankComparator.archive7, "Models"); - WorldMapLabel.method438(UserComparator8.archive8, "Sprites"); - WorldMapLabel.method438(GrandExchangeOffer.archive11, "Music Jingles"); - WorldMapLabel.method438(class189.archive14, "Music Samples"); - WorldMapLabel.method438(WorldMapSection1.archive15, "Music Patches"); - WorldMapLabel.method438(Clock.archive19, "World Map"); - WorldMapLabel.method438(UserComparator2.archive18, "World Map Geography"); - WorldMapLabel.method438(SecureRandomCallable.archive20, "World Map Ground"); - class222.spriteIds = new GraphicsDefaults(); - class222.spriteIds.decode(Client.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } else if (Client.titleLoadingStage == 45) { - class14.method173(22050, !Client.isLowDetail, 2); - MidiPcmStream var39 = new MidiPcmStream(); - var39.method3819(9, 128); - WorldMapLabelSize.pcmPlayer0 = AbstractWorldMapIcon.method627(GameShell.taskHandler, 0, 22050); - WorldMapLabelSize.pcmPlayer0.setStream(var39); - MouseRecorder.method1208(WorldMapSection1.archive15, class189.archive14, Client.archive4, var39); - class43.pcmPlayer1 = AbstractWorldMapIcon.method627(GameShell.taskHandler, 1, 2048); - class2.pcmStreamMixer = new PcmStreamMixer(); - class43.pcmPlayer1.setStream(class2.pcmStreamMixer); - WorldMapSection1.decimator = new Decimator(22050, PcmPlayer.field1398); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - NetSocket.WorldMapElement_fonts = new Fonts(UserComparator8.archive8, MouseHandler.archive13); - } else { - int var1; - if (Client.titleLoadingStage == 50) { - FontName[] var38 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; - var1 = var38.length; - Fonts var34 = NetSocket.WorldMapElement_fonts; - FontName[] var32 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; - Client.fontsMap = var34.createMap(var32); - if (Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; - Login.Login_loadingPercent = 40; - } else { - WorldMapData_0.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - class13.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - class1.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - NetSocket.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else { - Archive var2; - int var27; - Archive var41; - if (Client.titleLoadingStage == 60) { - var41 = HealthBar.archive10; - var2 = UserComparator8.archive8; - var27 = 0; - if (var41.tryLoadFileByNames("title.jpg", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("logo", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("titlebox", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("titlebutton", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("runes", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("title_mute", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var27; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var27; - } - - var2.tryLoadFileByNames("sl_back", ""); - var2.tryLoadFileByNames("sl_flags", ""); - var2.tryLoadFileByNames("sl_arrows", ""); - var2.tryLoadFileByNames("sl_stars", ""); - var2.tryLoadFileByNames("sl_button", ""); - byte var33 = 12; - if (var27 < var33) { - Login.Login_loadingText = "Loading title screen - " + var27 * 100 / var33 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - Projectile.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!GrandExchangeOfferWorldComparator.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + GrandExchangeOfferWorldComparator.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var37 = GrandExchangeOfferWorldComparator.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var37; - class83.method2109(GrandExchangeOfferWorldComparator.archive2); - var41 = GrandExchangeOfferWorldComparator.archive2; - var2 = BuddyRankComparator.archive7; - KitDefinition.KitDefinition_archive = var41; - KitDefinition.KitDefinition_modelsArchive = var2; - CollisionMap.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - Archive var3 = GrandExchangeOfferWorldComparator.archive2; - Archive var28 = BuddyRankComparator.archive7; - boolean var5 = Client.isLowDetail; - ObjectDefinition.ObjectDefinition_archive = var3; - ObjectDefinition.ObjectDefinition_modelsArchive = var28; - ObjectDefinition.ObjectDefinition_isLowDetail = var5; - Archive var6 = GrandExchangeOfferWorldComparator.archive2; - Archive var36 = BuddyRankComparator.archive7; - NPCDefinition.NpcDefinition_archive = var6; - NPCDefinition.NpcDefinition_modelArchive = var36; - GraphicsObject.method2063(GrandExchangeOfferWorldComparator.archive2); - Archive var8 = GrandExchangeOfferWorldComparator.archive2; - Archive var9 = BuddyRankComparator.archive7; - boolean var10 = Client.isMembersWorld; - Font var11 = WorldMapData_0.fontPlain11; - ItemDefinition.ItemDefinition_archive = var8; - ItemDefinition.ItemDefinition_modelArchive = var9; - class298.ItemDefinition_inMembersWorld = var10; - ItemDefinition.ItemDefinition_fileCount = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10); - ItemDefinition.ItemDefinition_fontPlain11 = var11; - TilePaint.method3149(GrandExchangeOfferWorldComparator.archive2, GrandExchangeEvent.archive0, class65.archive1); - Archive var12 = GrandExchangeOfferWorldComparator.archive2; - Archive var13 = BuddyRankComparator.archive7; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; - ArchiveDiskActionHandler.SpotAnimationDefinition_modelArchive = var13; - Archive var14 = GrandExchangeOfferWorldComparator.archive2; - class287.VarbitDefinition_archive = var14; - Archive var15 = GrandExchangeOfferWorldComparator.archive2; - VarpDefinition.VarpDefinition_archive = var15; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - SoundSystem.method2562(class267.archive3, BuddyRankComparator.archive7, UserComparator8.archive8, MouseHandler.archive13); - Archive var16 = GrandExchangeOfferWorldComparator.archive2; - InvDefinition.InvDefinition_archive = var16; - Archive var17 = GrandExchangeOfferWorldComparator.archive2; - GrandExchangeOfferAgeComparator.EnumDefinition_archive = var17; - Archive var18 = GrandExchangeOfferWorldComparator.archive2; - VarcInt.VarcInt_archive = var18; - Archive var19 = GrandExchangeOfferWorldComparator.archive2; - ParamDefinition.ParamDefinition_archive = var19; - class197.varcs = new Varcs(); - Archive var20 = GrandExchangeOfferWorldComparator.archive2; - Archive var21 = UserComparator8.archive8; - Archive var22 = MouseHandler.archive13; - class49.HitSplatDefinition_archive = var20; - HitSplatDefinition.field3329 = var21; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var22; - Archive var23 = GrandExchangeOfferWorldComparator.archive2; - Archive var24 = UserComparator8.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var23; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var24; - Varcs.method2212(GrandExchangeOfferWorldComparator.archive2, UserComparator8.archive8); - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (Entity.compass == null) { - Entity.compass = WorldMapSection1.SpriteBuffer_getSprite(UserComparator8.archive8, class222.spriteIds.compass, 0); - } else { - ++var0; - } - - if (ArchiveLoader.redHintArrowSprite == null) { - ArchiveLoader.redHintArrowSprite = WorldMapSection1.SpriteBuffer_getSprite(UserComparator8.archive8, class222.spriteIds.field3796, 0); - } else { - ++var0; - } - - IndexedSprite var7; - IndexedSprite[] var26; - IndexedSprite[] var29; - int var30; - if (VertexNormal.mapSceneSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.mapScenes; - if (!class228.method4199(var2, var27, 0)) { - var26 = null; - } else { - var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { - var7 = var29[var30] = new IndexedSprite(); - var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var7.height = class326.SpriteBuffer_spriteHeight; - var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; - var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; - var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; - var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; - var7.palette = class326.SpriteBuffer_spritePalette; - var7.pixels = class326.SpriteBuffer_pixels[var30]; - } - - DynamicObject.method2292(); - var26 = var29; - } - - VertexNormal.mapSceneSprites = var26; - } else { - ++var0; - } - - Sprite[] var40; - if (Ignored.headIconPkSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.headIconsPk; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - Ignored.headIconPkSprites = var40; - } else { - ++var0; - } - - if (class40.headIconPrayerSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3799; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - class40.headIconPrayerSprites = var40; - } else { - ++var0; - } - - if (SecureRandomCallable.headIconHintSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3800; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - SecureRandomCallable.headIconHintSprites = var40; - } else { - ++var0; - } - - if (StructDefinition.mapMarkerSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3803; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - StructDefinition.mapMarkerSprites = var40; - } else { - ++var0; - } - - if (WorldMapData_0.crossSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3802; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - WorldMapData_0.crossSprites = var40; - } else { - ++var0; - } - - if (AbstractWorldMapData.mapDotSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3805; - if (!class228.method4199(var2, var27, 0)) { - var40 = null; - } else { - var40 = HorizontalAlignment.method4783(); - } - - AbstractWorldMapData.mapDotSprites = var40; - } else { - ++var0; - } - - if (class192.scrollBarSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3804; - if (!class228.method4199(var2, var27, 0)) { - var26 = null; - } else { - var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { - var7 = var29[var30] = new IndexedSprite(); - var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var7.height = class326.SpriteBuffer_spriteHeight; - var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; - var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; - var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; - var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; - var7.palette = class326.SpriteBuffer_spritePalette; - var7.pixels = class326.SpriteBuffer_pixels[var30]; - } - - DynamicObject.method2292(); - var26 = var29; - } - - class192.scrollBarSprites = var26; - } else { - ++var0; - } - - if (InterfaceParent.modIconSprites == null) { - var2 = UserComparator8.archive8; - var27 = class222.spriteIds.field3795; - if (!class228.method4199(var2, var27, 0)) { - var26 = null; - } else { - var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { - var7 = var29[var30] = new IndexedSprite(); - var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var7.height = class326.SpriteBuffer_spriteHeight; - var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; - var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; - var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; - var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; - var7.palette = class326.SpriteBuffer_spritePalette; - var7.pixels = class326.SpriteBuffer_pixels[var30]; - } - - DynamicObject.method2292(); - var26 = var29; - } - - InterfaceParent.modIconSprites = var26; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = InterfaceParent.modIconSprites; - ArchiveLoader.redHintArrowSprite.normalize(); - var1 = (int)(Math.random() * 21.0D) - 10; - int var31 = (int)(Math.random() * 21.0D) - 10; - var27 = (int)(Math.random() * 21.0D) - 10; - int var4 = (int)(Math.random() * 41.0D) - 20; - VertexNormal.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var31, var27 + var4); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!GrandExchangeOfferNameComparator.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - Language.textureProvider = new TextureProvider(GrandExchangeOfferNameComparator.archive9, UserComparator8.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(Language.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = Language.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) { - class16.mouseRecorder = new MouseRecorder(); - GameShell.taskHandler.newThreadTask(class16.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!HealthBar.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var25 = new Huffman(HealthBar.archive10.takeFileByNames("huffman", "")); - TilePaint.method3150(var25); - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!class267.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class267.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!MilliClock.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + MilliClock.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!MouseHandler.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + MouseHandler.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 (!Clock.archive19.tryLoadGroupByName(WorldMapCacheName.field313.name)) { - Login.Login_loadingText = "Loading world map - " + Clock.archive19.groupLoadPercentByName(WorldMapCacheName.field313.name) / 10 + "%"; - } else { - if (WorldMapIcon_0.worldMap == null) { - WorldMapIcon_0.worldMap = new WorldMap(); - WorldMapIcon_0.worldMap.init(Clock.archive19, UserComparator2.archive18, SecureRandomCallable.archive20, class1.fontBold12, Client.fontsMap, VertexNormal.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - Projectile.updateGameState(10); - } - } - } - } -} diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java deleted file mode 100644 index cc461ce13e..0000000000 --- a/runescape-client/src/main/java/class226.java +++ /dev/null @@ -1,22 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ho") -public class class226 { - @ObfuscatedName("gn") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - - @ObfuscatedName("jc") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1597824761" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (ScriptFrame.loadInterface(var0)) { - WorldMapSection0.runComponentCloseListeners(WorldMapLabel.Widget_interfaceComponents[var0], var1); - } - } -} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java new file mode 100644 index 0000000000..c71dd1074d --- /dev/null +++ b/runescape-client/src/main/java/class227.java @@ -0,0 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hn") +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; + } + + } +} diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index 820125fe83..67ea470546 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -1,23 +1,94 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hu") public class class228 { - static { - Math.sqrt(8192.0D); + @ObfuscatedName("dc") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive8") + static Archive archive8; + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lmx;I)I", + garbageValue = "-1599704151" + ) + public static final int method4205(LoginType var0) { + if (var0 == null) { + return 12; + } else { + switch(var0.field4058) { + case 7: + return 20; + default: + return 12; + } + } } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lii;III)Z", - garbageValue = "-1380695861" + signature = "(IB)Lik;", + garbageValue = "2" ) - public static boolean method4199(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { + @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) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 1; + var3.key = (long)var0; + var3.archiveDisk = var1; + var3.archive = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.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; + } + } + + @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 { - SpriteMask.SpriteBuffer_decode(var3); + MusicPatch.SpriteBuffer_decode(var2); return true; } } diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java new file mode 100644 index 0000000000..0c2ca2785b --- /dev/null +++ b/runescape-client/src/main/java/class23.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("j") +public class class23 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1564129527 + ) + static int field134; + @ObfuscatedName("gm") + @Export("regionMapArchives") + static byte[][] regionMapArchives; +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java new file mode 100644 index 0000000000..3789fd0896 --- /dev/null +++ b/runescape-client/src/main/java/class231.java @@ -0,0 +1,28 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hr") +public class class231 { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)Liq;", + garbageValue = "111" + ) + @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; + } + } +} diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java new file mode 100644 index 0000000000..0298e1929e --- /dev/null +++ b/runescape-client/src/main/java/class232.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hv") +public class class232 { + @ObfuscatedName("hh") + @ObfuscatedSignature( + signature = "[Lle;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + + @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; + } +} diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java new file mode 100644 index 0000000000..a0d83c1e42 --- /dev/null +++ b/runescape-client/src/main/java/class234.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("im") +public class class234 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([Ljava/lang/String;[SB)V", + garbageValue = "-127" + ) + public static void method4221(String[] var0, short[] var1) { + GrandExchangeOffer.sortItemsByName(var0, var1, 0, var0.length - 1); + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)I", + garbageValue = "-31" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; + } +} diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java new file mode 100644 index 0000000000..b092e7376a --- /dev/null +++ b/runescape-client/src/main/java/class236.java @@ -0,0 +1,62 @@ +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ig") +public final class class236 { + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "Lhe;" + ) + @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)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class297.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } + + var1 = var2; + } + + return (char)var1; + } + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "121" + ) + @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(); + } + + 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 new file mode 100644 index 0000000000..fd1b8e7bd0 --- /dev/null +++ b/runescape-client/src/main/java/class237.java @@ -0,0 +1,442 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ic") +public class class237 { + 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); + class51.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/class238.java b/runescape-client/src/main/java/class238.java deleted file mode 100644 index d204d5c7c0..0000000000 --- a/runescape-client/src/main/java/class238.java +++ /dev/null @@ -1,223 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("in") -public class class238 { - @ObfuscatedName("c") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lll;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("o") - int[] field3189; - @ObfuscatedName("e") - int[] field3187; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -63300003 - ) - int field3190; - - public class238() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3189 = new int[2048]; - this.field3187 = new int[2048]; - this.field3190 = 0; - class218.field2718 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = Decimator.method2600((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); - class218.field2718[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < class218.field2718.length; var2 -= var6) { - var4 = var1 * 2; - - for (int var5 = Decimator.method2600((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class218.field2718.length; ++var1) { - class218.field2718[var1] = var5; - } - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1042631612" - ) - void method4393(int var1) { - int var2 = var1 * 2 + 1; - double[] var3 = BufferedSink.method5902(0.0D, (double)((float)var1 / 3.0F), var1); - double var4 = var3[var1] * var3[var1]; - int[] var6 = new int[var2 * var2]; - boolean var7 = false; - - for (int var8 = 0; var8 < var2; ++var8) { - for (int var9 = 0; var9 < var2; ++var9) { - int var10 = var6[var9 + var8 * var2] = (int)(var3[var8] * var3[var9] / var4 * 256.0D); - if (!var7 && var10 > 0) { - var7 = true; - } - } - } - - Sprite var11 = new Sprite(var6, var2, var2); - this.spriteMap.put(var1, var11); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IB)Llt;", - garbageValue = "-100" - ) - Sprite method4396(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method4393(var1); - } - - return (Sprite)this.spriteMap.get(var1); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "45" - ) - public final void method4408(int var1, int var2) { - if (this.field3190 < this.field3189.length) { - this.field3189[this.field3190] = var1; - this.field3187[this.field3190] = var2; - ++this.field3190; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - public final void method4395() { - this.field3190 = 0; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IILlt;FB)V", - garbageValue = "111" - ) - public final void method4404(int var1, int var2, Sprite var3, float var4) { - int var5 = (int)(18.0F * var4); - Sprite var6 = this.method4396(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3190; ++var10) { - var11 = this.field3189[var10]; - var12 = this.field3187[var10]; - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; - int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method6031(var8, var9); - this.method4397(var6, var3, var9); - } - - System.nanoTime(); - System.nanoTime(); - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; - } else { - if (var11 > class218.field2718.length) { - var11 = class218.field2718.length; - } - - var12 = class218.field2718[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; - } - } - } - - System.nanoTime(); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Llt;Llt;Lll;I)V", - garbageValue = "-1243462627" - ) - void method4397(Sprite var1, Sprite var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.lowY + var3.lowX; - - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; - } - - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-1969161403" - ) - static boolean method4414(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-28085" - ) - static void method4415() { - PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(Friend.getWindowedMode()); - var0.packetBuffer.writeShort(Username.canvasWidth); - var0.packetBuffer.writeShort(WorldMapData_1.canvasHeight); - Client.packetWriter.addNode(var0); - } -} diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java new file mode 100644 index 0000000000..4af3712faf --- /dev/null +++ b/runescape-client/src/main/java/class247.java @@ -0,0 +1,181 @@ +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("in") +public class class247 { + @ObfuscatedName("x") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lld;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("k") + int[] field3186; + @ObfuscatedName("d") + int[] field3184; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1540963759 + ) + int field3188; + + 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(); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "1" + ) + void method4411(int var1) { + int var2 = var1 * 2 + 1; + double[] var3 = class105.method2395(0.0D, (double)((float)var1 / 3.0F), var1); + double var4 = var3[var1] * var3[var1]; + int[] var6 = new int[var2 * var2]; + boolean var7 = false; + + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { + int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); + if (!var7 && var10 > 0) { + var7 = true; + } + } + } + + Sprite var11 = new Sprite(var6, var2, var2); + this.spriteMap.put(var1, var11); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(II)Lla;", + garbageValue = "1164975013" + ) + Sprite method4402(int var1) { + if (!this.spriteMap.containsKey(var1)) { + this.method4411(var1); + } + + return (Sprite)this.spriteMap.get(var1); + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "1687645228" + ) + 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; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1569288926" + ) + public final void method4406() { + this.field3188 = 0; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(IILla;FI)V", + garbageValue = "1134396059" + ) + public final void method4407(int var1, int var2, Sprite var3, float var4) { + int var5 = (int)(var4 * 18.0F); + Sprite var6 = this.method4402(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3188; ++var10) { + var11 = this.field3186[var10]; + var12 = this.field3184[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); + } + + System.nanoTime(); + System.nanoTime(); + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; + } else { + if (var11 > IntHashTable.field4034.length) { + var11 = IntHashTable.field4034.length; + } + + var12 = IntHashTable.field4034[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; + } + } + } + + System.nanoTime(); + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lla;Lla;Lld;I)V", + garbageValue = "-1592905794" + ) + void method4426(Sprite var1, Sprite var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; + int var7 = var2.subWidth * var3.lowY + var3.lowX; + + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; + } + + } + } +} diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java deleted file mode 100644 index 541af2eafd..0000000000 --- a/runescape-client/src/main/java/class248.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iv") -public class class248 { - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-1891456461" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return ClanMate.method5073(var0, 10, true); - } -} diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java new file mode 100644 index 0000000000..8f3f70db1b --- /dev/null +++ b/runescape-client/src/main/java/class25.java @@ -0,0 +1,259 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("f") +public class class25 { + @ObfuscatedName("qt") + @ObfuscatedSignature( + signature = "Ldx;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("et") + @ObfuscatedSignature( + signature = "Lih;" + ) + @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; + } + + } + } + } + } +} diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java new file mode 100644 index 0000000000..bd1664d57c --- /dev/null +++ b/runescape-client/src/main/java/class257.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("il") +public class class257 { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + public static void method4558() { + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + } +} diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java deleted file mode 100644 index 57df6a3a86..0000000000 --- a/runescape-client/src/main/java/class267.java +++ /dev/null @@ -1,89 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jo") -public class class267 { - @ObfuscatedName("dn") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive3") - static Archive archive3; - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-1781109205" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { - ByteArrayPool.ByteArrayPool_arrays[var1][VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - - } - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - signature = "(Lhn;III)V", - garbageValue = "1321817933" - ) - @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 = var7 * var5 + var4 * var8 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + class192.localPlayer.x >> 7; - int var12 = class192.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = TilePaint.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShort(Language.baseY * 64 + var12); - var13.packetBuffer.method5787(Messages.baseX * 64 + var11); - var13.packetBuffer.method5604(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(class192.localPlayer.x); - var13.packetBuffer.writeShort(class192.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - - } - } -} diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java deleted file mode 100644 index 4dbb3d1adc..0000000000 --- a/runescape-client/src/main/java/class268.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("js") -public class class268 { - @ObfuscatedName("m") - @Export("Tiles_hue") - static int[] Tiles_hue; - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1645671847" - ) - public static boolean method5042(int var0) { - return (var0 >> 31 & 1) != 0; - } -} diff --git a/runescape-client/src/main/java/class276.java b/runescape-client/src/main/java/class276.java new file mode 100644 index 0000000000..77345186eb --- /dev/null +++ b/runescape-client/src/main/java/class276.java @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000000..137ca1cde4 --- /dev/null +++ b/runescape-client/src/main/java/class277.java @@ -0,0 +1,49 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ja") +public class class277 { + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -322995175 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1950063557" + ) + public static void method5038() { + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); + } + + @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; + } + + 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; + } + } +} diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java new file mode 100644 index 0000000000..76a80b8a20 --- /dev/null +++ b/runescape-client/src/main/java/class278.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jp") +public class class278 { + @ObfuscatedName("ex") + @ObfuscatedSignature( + signature = "Lih;" + ) + @Export("archive19") + static Archive archive19; + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-2135141314" + ) + static int method5039(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + } +} diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java new file mode 100644 index 0000000000..7f62788577 --- /dev/null +++ b/runescape-client/src/main/java/class280.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jf") +public class class280 { + @ObfuscatedName("ep") + @ObfuscatedGetter( + intValue = 739756993 + ) + @Export("port3") + static int port3; + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IZI)Ljava/lang/String;", + garbageValue = "-627751714" + ) + @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/class287.java b/runescape-client/src/main/java/class287.java deleted file mode 100644 index 40ac2e9aa9..0000000000 --- a/runescape-client/src/main/java/class287.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ku") -public class class287 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - - @ObfuscatedName("jy") - @ObfuscatedSignature( - signature = "(IIIB)Lbe;", - garbageValue = "27" - ) - static final InterfaceParent method5327(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class51.Widget_resetModelFrames(var1); - Widget var4 = Varps.getWidget(var0); - NPCDefinition.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - GameObject.method3360(); - WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var0 >> 16], var4, false); - WorldMapLabelSize.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - class226.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } -} diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java deleted file mode 100644 index 8a655ef34e..0000000000 --- a/runescape-client/src/main/java/class288.java +++ /dev/null @@ -1,652 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ke") -public class class288 { - @ObfuscatedName("c") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; - } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - signature = "(Lbx;IIIIIB)V", - garbageValue = "1" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var76 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - int var10; - if (var1 < var76 && var0.playerCycle == Client.cycle && ClientPreferences.method1840((Player)var0)) { - Player var9 = (Player)var0; - if (var1 < var76) { - var10 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var10); - AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var12 = 9; - var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); - var8 = 18; - } - } - - int var77 = -2; - int var16; - int var17; - int var23; - int var24; - if (!var0.healthBars.method4886()) { - var10 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var10); - - for (HealthBar var91 = (HealthBar)var0.healthBars.last(); var91 != null; var91 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var78 = var91.get(Client.cycle); - if (var78 == null) { - if (var91.isEmpty()) { - var91.remove(); - } - } else { - HealthBarDefinition var13 = var91.definition; - Sprite var14 = var13.getBackSprite(); - Sprite var15 = var13.getFrontSprite(); - var17 = 0; - if (var14 != null && var15 != null) { - if (var13.widthPadding * 2 < var15.subWidth) { - var17 = var13.widthPadding; - } - - var16 = var15.subWidth - var17 * 2; - } else { - var16 = var13.width; - } - - int var18 = 255; - boolean var19 = true; - int var20 = Client.cycle - var78.cycle; - int var21 = var16 * var78.health2 / var13.width; - int var22; - int var95; - if (var78.cycleOffset > var20) { - var22 = var13.field3283 == 0 ? 0 : var13.field3283 * (var20 / var13.field3283); - var23 = var16 * var78.health / var13.width; - var95 = var22 * (var21 - var23) / var78.cycleOffset + var23; - } else { - var95 = var21; - var22 = var78.cycleOffset + var13.int5 - var20; - if (var13.int3 >= 0) { - var18 = (var22 << 8) / (var13.int5 - var13.int3); - } - } - - if (var78.health2 > 0 && var95 < 1) { - var95 = 1; - } - - if (var14 != null && var15 != null) { - if (var16 == var95) { - var95 += var17 * 2; - } else { - var95 += var17; - } - - var22 = var14.subHeight; - var77 += var22; - var23 = var2 + Client.viewportTempX - (var16 >> 1); - var24 = var3 + Client.viewportTempY - var77; - var23 -= var17; - if (var18 >= 0 && var18 < 255) { - var14.drawTransAt(var23, var24, var18); - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var22 + var24); - var15.drawTransAt(var23, var24, var18); - } else { - var14.drawTransBgAt(var23, var24); - Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var22 + var24); - var15.drawTransBgAt(var23, var24); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var77 += 2; - } else { - var77 += 5; - if (Client.viewportTempX > -1) { - var22 = var2 + Client.viewportTempX - (var16 >> 1); - var23 = var3 + Client.viewportTempY - var77; - Rasterizer2D.Rasterizer2D_fillRectangle(var22, var23, var95, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var95 + var22, var23, var16 - var95, 5, 16711680); - } - - var77 += 2; - } - } - } - } - - if (var77 == -2) { - var77 += 7; - } - - var77 += var8; - int var80; - if (var1 < var76) { - Player var79 = (Player)var0; - if (var79.isHidden) { - return; - } - - if (var79.headIconPk != -1 || var79.headIconPrayer != -1) { - var80 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var80); - if (Client.viewportTempX > -1) { - if (var79.headIconPk != -1) { - var77 += 25; - Ignored.headIconPkSprites[var79.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - - if (var79.headIconPrayer != -1) { - var77 += 25; - class40.headIconPrayerSprites[var79.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - var80 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var80); - if (Client.viewportTempX > -1) { - var77 += SecureRandomCallable.headIconHintSprites[1].subHeight; - SecureRandomCallable.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); - } - } - } else { - NPCDefinition var97 = ((NPC)var0).definition; - if (var97.transforms != null) { - var97 = var97.transform(); - } - - if (var97.headIconPrayer >= 0 && var97.headIconPrayer < class40.headIconPrayerSprites.length) { - var80 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var80); - if (Client.viewportTempX > -1) { - class40.headIconPrayerSprites[var97.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - var80 = var0.defaultHeight + 15; - MouseRecorder.worldToScreen(var0.x, var0.y, var80); - if (Client.viewportTempX > -1) { - SecureRandomCallable.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var76 || !var0.field954 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - var10 = var0.defaultHeight; - MouseRecorder.worldToScreen(var0.x, var0.y, var10); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = class1.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = class1.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 (var10 = 0; var10 < 4; ++var10) { - var80 = var0.hitSplatCycles[var10]; - int var92 = var0.hitSplatTypes[var10]; - HitSplatDefinition var93 = null; - int var81 = 0; - HitSplatDefinition var84; - if (var92 >= 0) { - if (var80 <= Client.cycle) { - continue; - } - - var16 = var0.hitSplatTypes[var10]; - var84 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); - HitSplatDefinition var94; - if (var84 != null) { - var94 = var84; - } else { - byte[] var85 = class49.HitSplatDefinition_archive.takeFile(32, var16); - var84 = new HitSplatDefinition(); - if (var85 != null) { - var84.decode(new Buffer(var85)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var84, (long)var16); - var94 = var84; - } - - var93 = var94; - var81 = var94.field3328; - if (var94 != null && var94.transforms != null) { - var93 = var94.transform(); - if (var93 == null) { - var0.hitSplatCycles[var10] = -1; - continue; - } - } - } else if (var80 < 0) { - continue; - } - - int var82 = var0.hitSplatTypes2[var10]; - HitSplatDefinition var83 = null; - if (var82 >= 0) { - HitSplatDefinition var98 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var82); - if (var98 != null) { - var84 = var98; - } else { - byte[] var86 = class49.HitSplatDefinition_archive.takeFile(32, var82); - var98 = new HitSplatDefinition(); - if (var86 != null) { - var98.decode(new Buffer(var86)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var98, (long)var82); - var84 = var98; - } - - var83 = var84; - if (var84 != null && var84.transforms != null) { - var83 = var84.transform(); - } - } - - if (var80 - var81 <= Client.cycle) { - if (var93 == null) { - var0.hitSplatCycles[var10] = -1; - } else { - var17 = var0.defaultHeight / 2; - MouseRecorder.worldToScreen(var0.x, var0.y, var17); - if (Client.viewportTempX > -1) { - if (var10 == 1) { - Client.viewportTempY -= 20; - } - - if (var10 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var10 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - Sprite var99 = null; - Sprite var87 = null; - Sprite var88 = null; - Sprite var89 = null; - var23 = 0; - var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - int var30 = 0; - Sprite var31 = null; - Sprite var32 = null; - Sprite var33 = null; - Sprite var34 = null; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - int var43 = 0; - var99 = var93.method4649(); - int var44; - if (var99 != null) { - var23 = var99.subWidth; - var44 = var99.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var27 = var99.xOffset; - } - - var87 = var93.method4650(); - if (var87 != null) { - var24 = var87.subWidth; - var44 = var87.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var28 = var87.xOffset; - } - - var88 = var93.method4651(); - if (var88 != null) { - var25 = var88.subWidth; - var44 = var88.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var29 = var88.xOffset; - } - - var89 = var93.method4652(); - if (var89 != null) { - var26 = var89.subWidth; - var44 = var89.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var30 = var89.xOffset; - } - - if (var83 != null) { - var31 = var83.method4649(); - if (var31 != null) { - var35 = var31.subWidth; - var44 = var31.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var39 = var31.xOffset; - } - - var32 = var83.method4650(); - if (var32 != null) { - var36 = var32.subWidth; - var44 = var32.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var40 = var32.xOffset; - } - - var33 = var83.method4651(); - if (var33 != null) { - var37 = var33.subWidth; - var44 = var33.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var41 = var33.xOffset; - } - - var34 = var83.method4652(); - if (var34 != null) { - var38 = var34.subWidth; - var44 = var34.subHeight; - if (var44 > var43) { - var43 = var44; - } - - var42 = var34.xOffset; - } - } - - Font var90 = var93.getFont(); - if (var90 == null) { - var90 = WorldMapData_0.fontPlain11; - } - - Font var45; - if (var83 != null) { - var45 = var83.getFont(); - if (var45 == null) { - var45 = WorldMapData_0.fontPlain11; - } - } else { - var45 = WorldMapData_0.fontPlain11; - } - - String var46 = null; - String var47 = null; - boolean var48 = false; - int var49 = 0; - var46 = var93.getString(var0.hitSplatValues[var10]); - int var96 = var90.stringWidth(var46); - if (var83 != null) { - var47 = var83.getString(var0.hitSplatValues2[var10]); - var49 = var45.stringWidth(var47); - } - - int var50 = 0; - int var51 = 0; - if (var24 > 0) { - if (var88 == null && var89 == null) { - var50 = 1; - } else { - var50 = var96 / var24 + 1; - } - } - - if (var83 != null && var36 > 0) { - if (var33 == null && var34 == null) { - var51 = 1; - } else { - var51 = var49 / var36 + 1; - } - } - - int var52 = 0; - int var53 = var52; - if (var23 > 0) { - var52 += var23; - } - - var52 += 2; - int var54 = var52; - if (var25 > 0) { - var52 += var25; - } - - int var55 = var52; - int var56 = var52; - int var57; - if (var24 > 0) { - var57 = var24 * var50; - var52 += var57; - var56 += (var57 - var96) / 2; - } else { - var52 += var96; - } - - var57 = var52; - if (var26 > 0) { - var52 += var26; - } - - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62 = 0; - int var63; - if (var83 != null) { - var52 += 2; - var58 = var52; - if (var35 > 0) { - var52 += var35; - } - - var52 += 2; - var59 = var52; - if (var37 > 0) { - var52 += var37; - } - - var60 = var52; - var62 = var52; - if (var36 > 0) { - var63 = var36 * var51; - var52 += var63; - var62 += (var63 - var49) / 2; - } else { - var52 += var49; - } - - var61 = var52; - if (var38 > 0) { - var52 += var38; - } - } - - var63 = var0.hitSplatCycles[var10] - Client.cycle; - int var64 = var93.field3323 - var63 * var93.field3323 / var93.field3328; - int var65 = var63 * var93.field3334 / var93.field3328 + -var93.field3334; - int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); - int var67 = var3 + Client.viewportTempY - 12 + var65; - int var68 = var67; - int var69 = var67 + var43; - int var70 = var67 + var93.field3338 + 15; - int var71 = var70 - var90.maxAscent; - int var72 = var70 + var90.maxDescent; - if (var71 < var67) { - var68 = var71; - } - - if (var72 > var69) { - var69 = var72; - } - - int var73 = 0; - int var74; - int var75; - if (var83 != null) { - var73 = var67 + var83.field3338 + 15; - var74 = var73 - var45.maxAscent; - var75 = var73 + var45.maxDescent; - if (var74 < var68) { - ; - } - - if (var75 > var69) { - ; - } - } - - var74 = 255; - if (var93.field3335 >= 0) { - var74 = (var63 << 8) / (var93.field3328 - var93.field3335); - } - - if (var74 >= 0 && var74 < 255) { - if (var99 != null) { - var99.drawTransAt(var53 + var66 - var27, var67, var74); - } - - if (var88 != null) { - var88.drawTransAt(var54 + var66 - var29, var67, var74); - } - - if (var87 != null) { - for (var75 = 0; var75 < var50; ++var75) { - var87.drawTransAt(var24 * var75 + (var55 + var66 - var28), var67, var74); - } - } - - if (var89 != null) { - var89.drawTransAt(var66 + var57 - var30, var67, var74); - } - - var90.drawAlpha(var46, var66 + var56, var70, var93.textColor, 0, var74); - if (var83 != null) { - if (var31 != null) { - var31.drawTransAt(var58 + var66 - var39, var67, var74); - } - - if (var33 != null) { - var33.drawTransAt(var66 + var59 - var41, var67, var74); - } - - if (var32 != null) { - for (var75 = 0; var75 < var51; ++var75) { - var32.drawTransAt(var36 * var75 + (var60 + var66 - var40), var67, var74); - } - } - - if (var34 != null) { - var34.drawTransAt(var66 + var61 - var42, var67, var74); - } - - var45.drawAlpha(var47, var62 + var66, var73, var83.textColor, 0, var74); - } - } else { - if (var99 != null) { - var99.drawTransBgAt(var66 + var53 - var27, var67); - } - - if (var88 != null) { - var88.drawTransBgAt(var54 + var66 - var29, var67); - } - - if (var87 != null) { - for (var75 = 0; var75 < var50; ++var75) { - var87.drawTransBgAt(var75 * var24 + (var66 + var55 - var28), var67); - } - } - - if (var89 != null) { - var89.drawTransBgAt(var57 + var66 - var30, var67); - } - - var90.draw(var46, var56 + var66, var70, var93.textColor | -16777216, 0); - if (var83 != null) { - if (var31 != null) { - var31.drawTransBgAt(var58 + var66 - var39, var67); - } - - if (var33 != null) { - var33.drawTransBgAt(var59 + var66 - var41, var67); - } - - if (var32 != null) { - for (var75 = 0; var75 < var51; ++var75) { - var32.drawTransBgAt(var36 * var75 + (var60 + var66 - var40), var67); - } - } - - if (var34 != null) { - var34.drawTransBgAt(var61 + var66 - var42, var67); - } - - var45.draw(var47, var62 + var66, var73, var83.textColor | -16777216, 0); - } - } - } - } - } - } - - } - } -} diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java deleted file mode 100644 index 83c4ae11f2..0000000000 --- a/runescape-client/src/main/java/class289.java +++ /dev/null @@ -1,43 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kl") -public final class class289 { - @ObfuscatedName("c") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("t") - static long[] field3642; - - 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'}; - field3642 = new long[12]; - - for (int var0 = 0; var0 < field3642.length; ++var0) { - field3642[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(I)[Lkx;", - garbageValue = "822610735" - ) - static PrivateChatMode[] method5359() { - return new PrivateChatMode[]{PrivateChatMode.field3789, PrivateChatMode.field3790, PrivateChatMode.field3788}; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1942089973" - ) - static final int method5358(int var0, int var1) { - int var2 = var0 + var1 * 57; - var2 ^= var2 << 13; - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } -} diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java deleted file mode 100644 index 3e0335978d..0000000000 --- a/runescape-client/src/main/java/class290.java +++ /dev/null @@ -1,129 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kh") -public class class290 { - @ObfuscatedName("c") - static char[] field3646; - @ObfuscatedName("t") - static char[] field3648; - @ObfuscatedName("o") - static char[] field3647; - @ObfuscatedName("e") - static int[] field3645; - - static { - field3646 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3646[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3646[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3646[var0] = (char)(var0 + 48 - 52); - } - - field3646[62] = '+'; - field3646[63] = '/'; - field3648 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3648[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3648[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3648[var0] = (char)(var0 + 48 - 52); - } - - field3648[62] = '*'; - field3648[63] = '-'; - field3647 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3647[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3647[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3647[var0] = (char)(var0 + 48 - 52); - } - - field3647[62] = '-'; - field3647[63] = '_'; - field3645 = new int[128]; - - for (var0 = 0; var0 < field3645.length; ++var0) { - field3645[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3645[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3645[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3645[var0] = var0 - 48 + 52; - } - - int[] var2 = field3645; - field3645[43] = 62; - var2[42] = 62; - int[] var1 = field3645; - field3645[47] = 63; - var1[45] = 63; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-514037609" - ) - public static String method5360(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(); - } - } -} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java new file mode 100644 index 0000000000..3f7b5168b2 --- /dev/null +++ b/runescape-client/src/main/java/class296.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kk") +public class class296 { + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; +} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java new file mode 100644 index 0000000000..346e119fbf --- /dev/null +++ b/runescape-client/src/main/java/class297.java @@ -0,0 +1,52 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kn") +public class class297 { + @ObfuscatedName("x") + @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 46ab3c1a40..50bb7718dd 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -1,9 +1,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") -public class class298 { - @ObfuscatedName("l") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; +@ObfuscatedName("kq") +public final class class298 { + @ObfuscatedName("x") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("m") + static long[] field3643; + + 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]; + + for (int var0 = 0; var0 < field3643.length; ++var0) { + field3643[var0] = (long)Math.pow(37.0D, (double)var0); + } + + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Liy;II)Lhy;", + garbageValue = "16711680" + ) + static MusicPatch method5343(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } } diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java new file mode 100644 index 0000000000..e704b28387 --- /dev/null +++ b/runescape-client/src/main/java/class299.java @@ -0,0 +1,191 @@ +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ks") +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; + + static { + field3646 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3646[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3646[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3646[var0] = (char)(var0 + 48 - 52); + } + + field3646[62] = '+'; + field3646[63] = '/'; + field3647 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3647[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3647[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3647[var0] = (char)(var0 + 48 - 52); + } + + field3647[62] = '*'; + field3647[63] = '-'; + field3648 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3648[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3648[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3648[var0] = (char)(var0 + 48 - 52); + } + + field3648[62] = '-'; + field3648[63] = '_'; + field3649 = new int[128]; + + for (var0 = 0; var0 < field3649.length; ++var0) { + field3649[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3649[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3649[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3649[var0] = var0 - 48 + 52; + } + + int[] var2 = field3649; + field3649[43] = 62; + var2[42] = 62; + int[] var1 = field3649; + field3649[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.field1205) { + 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.field1205 = 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 6320d62155..e9d1ffed97 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,182 +1,230 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("d") public class class3 implements Enumerated { - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Le;" + signature = "Ld;" ) - public static final class3 field22; + static final class3 field11; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Ld;" + ) + static final class3 field13; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Ld;" + ) + static final class3 field7; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Le;" + signature = "Lle;" ) - public static final class3 field15; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Le;" - ) - public static final class3 field16; - @ObfuscatedName("e") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -794176661 + intValue = 778706931 ) - final int field17; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 500011769 - ) - public final int field18; - @ObfuscatedName("g") - final Class field19; + public static int field16; @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lc;" + @ObfuscatedGetter( + intValue = 1188320115 ) - final class0 field20; + final int field8; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1711821185 + ) + public final int field9; + @ObfuscatedName("v") + final Class field10; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lx;" + ) + final class0 field5; static { - field22 = new class3(0, 0, Integer.class, new class1()); - field15 = new class3(1, 1, Long.class, new class2()); - field16 = new class3(2, 2, String.class, new class4()); + 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()); } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lc;)V" + signature = "(IILjava/lang/Class;Lx;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field17 = var1; - this.field18 = var2; - this.field19 = var3; - this.field20 = var4; + this.field8 = var1; + this.field9 = var2; + this.field10 = var3; + this.field5 = var4; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "56" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field18; + return this.field9; } - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/Object;", - garbageValue = "1079792403" + signature = "(Lkb;B)Ljava/lang/Object;", + garbageValue = "22" ) - public Object method38(Buffer var1) { - return this.field20.vmethod53(var1); + public Object method42(Buffer var1) { + return this.field5.vmethod74(var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Le;", - garbageValue = "1607211171" + signature = "(I)[Ld;", + garbageValue = "1248290062" ) - public static class3 method51(Class var0) { - class3[] var1 = new class3[]{field15, field22, field16}; - class3[] var2 = var1; + public static class3[] method46() { + return new class3[]{field7, field11, field13}; + } - for (int var3 = 0; var3 < var2.length; ++var3) { - class3 var4 = var2[var3]; - if (var4.field19 == var0) { - return var4; + @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; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/Class;I)Ld;", + garbageValue = "-1981111471" + ) + public static class3 method38(Class var0) { + class3[] var1 = method46(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + class3 var3 = var1[var2]; + if (var3.field10 == var0) { + return var3; } } return null; } - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkp;B)V", - garbageValue = "-3" + signature = "(Ljava/lang/Class;I)Lx;", + garbageValue = "-334212288" ) - public static void method35(Object var0, Buffer var1) { - class0 var2 = method36(var0.getClass()); - var2.vmethod55(var0, var1); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Lc;", - garbageValue = "-201332195" - ) - static class0 method36(Class var0) { - class3 var1 = method51(var0); + public static class0 method40(Class var0) { + class3 var1 = method38(var0); if (var1 == null) { throw new IllegalArgumentException(); } else { - return var1.field20; + return var1.field5; } } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-95" + signature = "(III)I", + garbageValue = "-61779781" ) - public static void method52() { - try { - File var0 = new File(UserComparator4.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label37: - for (int var1 = 0; var1 < class42.field373.length; ++var1) { - for (var2 = 0; var2 < ChatChannel.field1291.length; ++var2) { - File var3 = new File(ChatChannel.field1291[var2] + class42.field373[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label37; - } - } + 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; + } + + 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; } } - 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("lt") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "14702" + ) + static void method48() { + if (Client.oculusOrbState == 1) { + Client.field770 = true; } } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "310348252" - ) - static final int method49(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 = UserComparator4.method3450(var3, var5); - int var8 = UserComparator4.method3450(var3 + 1, var5); - int var9 = UserComparator4.method3450(var3, var5 + 1); - int var10 = UserComparator4.method3450(var3 + 1, var5 + 1); - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 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/class30.java b/runescape-client/src/main/java/class30.java deleted file mode 100644 index 6f3bdd7a7c..0000000000 --- a/runescape-client/src/main/java/class30.java +++ /dev/null @@ -1,153 +0,0 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("aj") -public class class30 { - @ObfuscatedName("sj") - @ObfuscatedGetter( - longValue = -3315031402315742045L - ) - static long field274; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Laj;" - ) - static final class30 field270; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Laj;" - ) - static final class30 field271; - @ObfuscatedName("h") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("gy") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 404466751 - ) - @Export("value") - final int value; - - static { - field270 = new class30(0); - field271 = new class30(1); - } - - class30(int var1) { - this.value = var1; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "25" - ) - static long method567() { - try { - URL var0 = new URL(class42.method809("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("fm") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1945263247" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - Skeleton.method3152(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - FontName.method5402(); - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - WorldMapData_0.method181(); - WorldMapSection2.method342(); - WorldMapCacheName.method635(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - UserComparator7.method3481(); - class215.method4095(); - WallDecoration.method3359(); - PlayerAppearance.PlayerAppearance_cachedModels.clear(); - MilliClock.method3535(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - GrandExchangeEvent.archive0.clearFiles(); - class65.archive1.clearFiles(); - class267.archive3.clearFiles(); - Client.archive4.clearFiles(); - NetSocket.archive5.clearFiles(); - MouseHandler.archive6.clearFiles(); - BuddyRankComparator.archive7.clearFiles(); - UserComparator8.archive8.clearFiles(); - GrandExchangeOfferNameComparator.archive9.clearFiles(); - HealthBar.archive10.clearFiles(); - GrandExchangeOffer.archive11.clearFiles(); - MilliClock.archive12.clearFiles(); - ServerBuild.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - class197.field2414 = 1; - UserComparator5.musicTrackArchive = null; - class197.musicTrackGroupId = -1; - class83.musicTrackFileId = -1; - AttackOption.musicTrackVolume = 0; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 2; - Client.currentTrackGroupId = -1; - Client.field881 = false; - UrlRequest.method3375(); - Projectile.updateGameState(10); - } -} diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java new file mode 100644 index 0000000000..dbfa3f9071 --- /dev/null +++ b/runescape-client/src/main/java/class300.java @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000000..6f2cffd5d4 --- /dev/null +++ b/runescape-client/src/main/java/class303.java @@ -0,0 +1,30 @@ +import java.io.IOException; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kg") +public class class303 { + @ObfuscatedName("hh") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "83308919" + ) + static final void method5397(boolean var0) { + ChatChannel.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); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.field728 = true; + } + } + + } + } +} diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java new file mode 100644 index 0000000000..83179f4cb0 --- /dev/null +++ b/runescape-client/src/main/java/class306.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kp") +public final class class306 { + @ObfuscatedName("x") + @ObfuscatedGetter( + longValue = 6842035399561472051L + ) + static long field3698; + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 1959043589227198219L + ) + static long field3699; +} diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class310.java similarity index 95% rename from runescape-client/src/main/java/class301.java rename to runescape-client/src/main/java/class310.java index 1fa5e47a95..4d56fbdefe 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class310.java @@ -2,8 +2,8 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("kd") -public class class301 { - @ObfuscatedName("c") +public class class310 { + @ObfuscatedName("x") @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 class301 { } - @ObfuscatedName("m") + @ObfuscatedName("e") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java deleted file mode 100644 index c92bc7f997..0000000000 --- a/runescape-client/src/main/java/class313.java +++ /dev/null @@ -1,84 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ld") -public enum class313 implements Enumerated { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3815(5, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3812(4, 2), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3809(1, 5), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3808(3, 6), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3811(2, 7), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lld;" - ) - field3810(0, 8); - - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -2058457901 - ) - final int field3813; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -695700033 - ) - @Export("id") - final int id; - - class313(int var3, int var4) { - this.field3813 = var3; - this.id = var4; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)Lli;", - garbageValue = "-432973503" - ) - public static IndexedSprite method5962() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = GZipDecompressor.SpriteBuffer_spriteWidth; - var0.height = class326.SpriteBuffer_spriteHeight; - var0.xOffset = Huffman.SpriteBuffer_xOffsets[0]; - var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; - var0.subWidth = class326.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class326.SpriteBuffer_spriteHeights[0]; - var0.palette = class326.SpriteBuffer_spritePalette; - var0.pixels = class326.SpriteBuffer_pixels[0]; - DynamicObject.method2292(); - return var0; - } -} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java deleted file mode 100644 index 1350e3a3be..0000000000 --- a/runescape-client/src/main/java/class32.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ay") -public class class32 { - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Llt;" - ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; -} diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java deleted file mode 100644 index 9f4b3366f2..0000000000 --- a/runescape-client/src/main/java/class320.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lq") -public class class320 { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1209977249 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; -} diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java new file mode 100644 index 0000000000..7e0775447f --- /dev/null +++ b/runescape-client/src/main/java/class322.java @@ -0,0 +1,73 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ly") +public enum class322 implements Enumerated { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lly;" + ) + field3825(1, 0), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lly;" + ) + field3826(2, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lly;" + ) + 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); + + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1073054417 + ) + final int field3831; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1340728697 + ) + final int field3828; + + class322(int var3, int var4) { + this.field3831 = var3; + this.field3828 = var4; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "56" + ) + @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(); + } +} diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java deleted file mode 100644 index d17ecf1f72..0000000000 --- a/runescape-client/src/main/java/class326.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lx") -public class class326 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1194876757 - ) - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -7287781 - ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("g") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("d") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("l") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("j") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; -} diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java new file mode 100644 index 0000000000..1eff12bb6e --- /dev/null +++ b/runescape-client/src/main/java/class329.java @@ -0,0 +1,18 @@ +import java.awt.Component; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lz") +public class class329 { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/awt/Component;B)V", + garbageValue = "1" + ) + static void method6078(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; + } +} diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java new file mode 100644 index 0000000000..a74e6dcc28 --- /dev/null +++ b/runescape-client/src/main/java/class332.java @@ -0,0 +1,57 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lu") +public enum class332 implements Enumerated { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Llu;" + ) + @Export("SOLID") + SOLID(0, 0), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Llu;" + ) + field3874(1, 1), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Llu;" + ) + field3875(2, 2); + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Ldh;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1537098807 + ) + public final int field3873; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -92633923 + ) + @Export("id") + final int id; + + class332(int var3, int var4) { + this.field3873 = var3; + this.id = var4; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "56" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } +} diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java new file mode 100644 index 0000000000..20bc2659e4 --- /dev/null +++ b/runescape-client/src/main/java/class335.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ls") +public class class335 { + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 215580169 + ) + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -109825329 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1417821821 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("d") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("v") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("q") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; +} diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class336.java similarity index 50% rename from runescape-client/src/main/java/class216.java rename to runescape-client/src/main/java/class336.java index 1653aafbcc..0ed20b4602 100644 --- a/runescape-client/src/main/java/class216.java +++ b/runescape-client/src/main/java/class336.java @@ -2,14 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hs") -public class class216 { +@ObfuscatedName("lr") +public class class336 { @ObfuscatedName("t") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 276241037 + intValue = -1356543079 ) - static int field2559; + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; } diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java deleted file mode 100644 index 71c46bd1d3..0000000000 --- a/runescape-client/src/main/java/class337.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ls") -public class class337 { - @ObfuscatedName("m") - static final int[] field4016; - @ObfuscatedName("p") - static final int[] field4025; - - static { - field4016 = new int[2048]; - field4025 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field4016[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4025[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); - } - - } -} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java deleted file mode 100644 index 9216ac5d2b..0000000000 --- a/runescape-client/src/main/java/class339.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mj") -public class class339 { - @ObfuscatedName("o") - static final char[] field4042; - @ObfuscatedName("e") - static final char[] field4041; - - static { - field4042 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4041 = new char[]{'[', ']', '#'}; - } -} diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java new file mode 100644 index 0000000000..af84b78146 --- /dev/null +++ b/runescape-client/src/main/java/class346.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mc") +public class class346 { + @ObfuscatedName("e") + static final int[] field4043; + @ObfuscatedName("s") + static final int[] field4047; + + static { + field4043 = new int[2048]; + field4047 = 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)); + } + + } +} diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java new file mode 100644 index 0000000000..5e1797bceb --- /dev/null +++ b/runescape-client/src/main/java/class348.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mr") +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;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + + static { + field4062 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4063 = new char[]{'[', ']', '#'}; + } +} diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java new file mode 100644 index 0000000000..ae8a9f7757 --- /dev/null +++ b/runescape-client/src/main/java/class39.java @@ -0,0 +1,137 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("aq") +public class class39 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Laq;" + ) + static final class39 field300; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Laq;" + ) + static final class39 field297; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1809213565 + ) + @Export("value") + final int value; + + static { + field300 = new class39(0); + field297 = new class39(1); + } + + class39(int var1) { + this.value = var1; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;ZI)[B", + garbageValue = "-185232058" + ) + 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(); + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)[Lcb;", + garbageValue = "-70" + ) + static AttackOption[] method643() { + return new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; + } + + @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); + } + + var4 = true; + break; + } + } + + if (!var4) { + Skeleton.addGameMessage(4, "", "Unable to find " + var1); + } + + } +} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 65e1a40144..257d924ff8 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -3,107 +3,113 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("w") final class class4 implements class0 { - @ObfuscatedName("h") + @ObfuscatedName("rv") @ObfuscatedGetter( - intValue = -905472929 + intValue = 213671429 ) - static int field26; - @ObfuscatedName("y") + static int field20; + @ObfuscatedName("t") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lle;" ) - @Export("NetCache_reference") - static Buffer NetCache_reference; + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkp;B)V", - garbageValue = "95" + signature = "(Ljava/lang/Object;Lkb;B)V", + garbageValue = "3" ) - public void vmethod55(Object var1, Buffer var2) { - this.method54((String)var1, var2); + public void vmethod64(Object var1, Buffer var2) { + this.method61((String)var1, var2); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1146837249" + ) + public Object vmethod74(Buffer var1) { + return var1.readStringCp1252NullTerminated(); } @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkp;I)Ljava/lang/Object;", - garbageValue = "1665636232" + signature = "(Ljava/lang/String;Lkb;I)V", + garbageValue = "-1770492713" ) - public Object vmethod53(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkp;I)V", - garbageValue = "1837357255" - ) - void method54(String var1, Buffer var2) { + void method61(String var1, Buffer var2) { var2.writeStringCp1252NullTerminated(var1); } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1447651687" + signature = "(Lkj;II)V", + garbageValue = "-1157404679" ) - static int method57() { - return ++Messages.Messages_count - 1; - } + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + WorldMapID.method648(var0); - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lbw;I)V", - garbageValue = "1307142310" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - WorldMapID.runScript(var0, 500000); - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2068371159" - ) - static final void method64() { - int var0 = ArchiveDiskAction.menuX; - int var1 = SecureRandomCallable.menuY; - int var2 = InterfaceParent.menuWidth; - int var3 = Message.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); - class1.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); - int var5 = MouseHandler.MouseHandler_x; - int var6 = MouseHandler.MouseHandler_y; - - int var7; - int var8; - int var9; - for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { - var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; - var9 = 16777215; - if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { - var9 = 16776960; + 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; } - class1.fontBold12.draw(VerticalAlignment.method4426(var7), var0 + 3, var8, var9, 0); + GrandExchangeOfferNameComparator.method239(var0, var4, var5, var6); } - var7 = ArchiveDiskAction.menuX; - var8 = SecureRandomCallable.menuY; - var9 = InterfaceParent.menuWidth; - int var10 = Message.menuHeight; + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } - 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] < var8 + var10) { - Client.field852[var11] = true; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "-102" + ) + 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; + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "989659851" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (LoginScreenAnimation.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; + } } - } + } } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java deleted file mode 100644 index 558d216ed5..0000000000 --- a/runescape-client/src/main/java/class40.java +++ /dev/null @@ -1,804 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("av") -public class class40 { - @ObfuscatedName("v") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "[Llt;" - ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -207951793 - ) - @Export("pixelsPerTile") - int pixelsPerTile; - @ObfuscatedName("t") - @Export("tileTemplates") - byte[][][] tileTemplates; - - class40(int var1) { - this.pixelsPerTile = var1; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "-1008655546" - ) - void method736(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.method737(var8, var7); - var7 = this.method740(var7); - Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-88869818" - ) - int method737(int var1, int var2) { - if (var2 == 9) { - var1 = var1 + 1 & 3; - } - - if (var2 == 10) { - var1 = var1 + 3 & 3; - } - - if (var2 == 11) { - var1 = var1 + 3 & 3; - } - - return var1; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-50" - ) - int method740(int var1) { - if (var1 != 9 && var1 != 10) { - return var1 == 11 ? 8 : var1; - } else { - return 1; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1894948040" - ) - @Export("init") - void init() { - if (this.tileTemplates == null) { - this.tileTemplates = new byte[8][4][]; - this.init0(); - this.init1(); - this.init2(); - this.init3(); - this.init4(); - this.init5(); - this.init6(); - this.init7(); - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-382009936" - ) - @Export("init0") - void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][3] = var1; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1984222504" - ) - @Export("init1") - void init1() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[1][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var2 >= 0 && var2 < var1.length) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } else { - ++var2; - } - } - } - - this.tileTemplates[1][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[1][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[1][3] = var1; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "728163043" - ) - @Export("init2") - void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][3] = var1; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1802429738" - ) - @Export("init3") - void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][3] = var1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-647414873" - ) - @Export("init4") - void init4() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][3] = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1171855086" - ) - @Export("init5") - void init5() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 <= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 >= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][3] = var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - @Export("init6") - void init6() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[6][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[6][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[6][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[6][3] = var1; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-106861274" - ) - @Export("init7") - void init7() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[7][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[7][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[7][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[7][3] = var1; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lks;II)Z", - garbageValue = "-1391671587" - ) - @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.field1235[var1] != null) { - var6.read(Players.field1235[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.field1237[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - Messages.baseX * 64, (var10 << 13) + var4 - Language.baseY * 64); - var6.field621 = 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("n") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-56" - ) - public static String method735(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)) { - char var6; - if (var5 != 181 && var5 != 402) { - var6 = Character.toTitleCase(var5); - } else { - var6 = var5; - } - - var5 = var6; - } - - 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/class41.java b/runescape-client/src/main/java/class41.java new file mode 100644 index 0000000000..b72eb6dcc9 --- /dev/null +++ b/runescape-client/src/main/java/class41.java @@ -0,0 +1,300 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ak") +public class class41 { + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lld;" + ) + static Bounds field315; + @ObfuscatedName("df") + @ObfuscatedSignature( + signature = "Lih;" + ) + @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]; + } + + 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; + } + } + + 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.readySequence && (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.readySequence && (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") + @ObfuscatedSignature( + signature = "(Lbm;ZI)V", + garbageValue = "-750063376" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + EnumDefinition.method4614(var2); + } + + LoginScreenAnimation.method1938(var2); + Widget var4 = MusicPatchNode.getWidget(var3); + if (var4 != null) { + ItemContainer.invalidateWidget(var4); + } + + ChatChannel.method2354(); + if (Client.rootInterface != -1) { + class198.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/class42.java b/runescape-client/src/main/java/class42.java deleted file mode 100644 index 41eb1a443c..0000000000 --- a/runescape-client/src/main/java/class42.java +++ /dev/null @@ -1,303 +0,0 @@ -import java.awt.FontMetrics; -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("ad") -public class class42 implements WorldMapSection { - @ObfuscatedName("q") - public static String[] field373; - @ObfuscatedName("aj") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -794430173 - ) - int field371; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1085068769 - ) - int field367; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1005090491 - ) - int field366; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 283016431 - ) - int field369; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -15254045 - ) - int field372; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -865271583 - ) - int field370; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1602446289 - ) - int field376; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -2003918993 - ) - int field368; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -500974497 - ) - int field374; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1662707559 - ) - int field375; - - class42() { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lae;I)V", - garbageValue = "-1034100543" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field372) { - var1.regionLowX = this.field372; - } - - if (var1.regionHighX < this.field372) { - var1.regionHighX = this.field372; - } - - if (var1.regionLowY > this.field370) { - var1.regionLowY = this.field370; - } - - if (var1.regionHighY < this.field370) { - var1.regionHighY = this.field370; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-110" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field371 && var1 < this.field371 + this.field367) { - return var2 >= (this.field366 << 6) + (this.field376 << 3) && var2 <= (this.field366 << 6) + (this.field376 << 3) + 7 && var3 >= (this.field369 << 6) + (this.field368 << 3) && var3 <= (this.field369 << 6) + (this.field368 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "37" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field372 << 6) + (this.field374 << 3) && var1 <= (this.field372 << 6) + (this.field374 << 3) + 7 && var2 >= (this.field370 << 6) + (this.field375 << 3) && var2 <= (this.field370 << 6) + (this.field375 << 3) + 7; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(IIII)[I", - garbageValue = "-96920779" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{this.field372 * 64 - this.field366 * 64 + var2 + (this.field374 * 8 - this.field376 * 8), var3 + (this.field370 * 64 - this.field369 * 64) + (this.field375 * 8 - this.field368 * 8)}; - return var4; - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "911083222" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field366 * 64 - this.field372 * 64 + (this.field376 * 8 - this.field374 * 8) + var1; - int var4 = this.field369 * 64 - this.field370 * 64 + var2 + (this.field368 * 8 - this.field375 * 8); - return new Coord(this.field371, var3, var4); - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(Lkp;B)V", - garbageValue = "76" - ) - @Export("read") - public void read(Buffer var1) { - this.field371 = var1.readUnsignedByte(); - this.field367 = var1.readUnsignedByte(); - this.field366 = var1.readUnsignedShort(); - this.field376 = var1.readUnsignedByte(); - this.field369 = var1.readUnsignedShort(); - this.field368 = var1.readUnsignedByte(); - this.field372 = var1.readUnsignedShort(); - this.field374 = var1.readUnsignedByte(); - this.field370 = var1.readUnsignedShort(); - this.field375 = var1.readUnsignedByte(); - this.method788(); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-111" - ) - void method788() { - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(CLgl;B)I", - garbageValue = "15" - ) - @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("q") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "1" - ) - static int method810(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); - } else { - var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; - } - - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1088 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field582 = Interpreter.field1088 + 1; - Client.scriptEvents.addFirst(var4); - return 1; - } - } else { - return 2; - } - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZS)Ljava/lang/String;", - garbageValue = "-9068" - ) - static String method809(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 (GameShell.field477 != null) { - var3 = "/p=" + GameShell.field477; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + FriendLoginUpdate.clientLanguage + "/a=" + Client.field672 + var3 + "/"; - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "572595678" - ) - @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 < ItemDefinition.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = HealthBarDefinition.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - class162.foundItemIdCount = -1; - WorldMapData_0.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; - } - } - - WorldMapData_0.foundItemIds = var2; - AbstractByteArrayCopier.foundItemIndex = 0; - class162.foundItemIdCount = var3; - String[] var8 = new String[class162.foundItemIdCount]; - - for (int var9 = 0; var9 < class162.foundItemIdCount; ++var9) { - var8[var9] = HealthBarDefinition.ItemDefinition_get(var2[var9]).name; - } - - short[] var10 = WorldMapData_0.foundItemIds; - FriendLoginUpdate.sortItemsByName(var8, var10, 0, var8.length - 1); - } -} diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java deleted file mode 100644 index 54a558d632..0000000000 --- a/runescape-client/src/main/java/class43.java +++ /dev/null @@ -1,69 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("am") -public final class class43 { - @ObfuscatedName("qp") - @ObfuscatedSignature( - signature = "Ldw;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -2015849949 - ) - static int field381; - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)Lbn;", - garbageValue = "-983073165" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1093470855" - ) - public static int method816(int var0) { - return class14.method169(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Lks;B)V", - garbageValue = "-25" - ) - static final void method813(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { - int var2 = Players.Players_pendingUpdateIndices[var1]; - Player var3 = Client.players[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 4) != 0) { - var4 += var0.readUnsignedByte() << 8; - } - - AbstractWorldMapIcon.method613(var0, var2, var3, var4); - } - - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-67193374" - ) - static final void method817(String var0) { - PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } -} diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/class49.java index 5b663142c6..406492c62a 100644 --- a/runescape-client/src/main/java/class49.java +++ b/runescape-client/src/main/java/class49.java @@ -1,195 +1,652 @@ -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("ab") +@ObfuscatedName("ah") public class class49 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lii;" + @ObfuscatedName("lo") + @ObfuscatedGetter( + intValue = 863785417 ) - @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -182915585 + ) + @Export("pixelsPerTile") + int pixelsPerTile; + @ObfuscatedName("m") + @Export("tileTemplates") + byte[][][] tileTemplates; - static { - ImageIO.setUseCache(false); + class49(int var1) { + this.pixelsPerTile = var1; } - @ObfuscatedName("fd") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-624446357" + signature = "(IIIIIIIIB)V", + garbageValue = "-32" ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { - Archive var2 = GrandExchangeOffer.archive11; - int var3 = Client.musicVolume; - class197.field2414 = 1; - UserComparator5.musicTrackArchive = var2; - class197.musicTrackGroupId = var0; - class83.musicTrackFileId = 0; - AttackOption.musicTrackVolume = var3; - KeyHandler.musicTrackBoolean = false; - class197.field2412 = 10000; - Client.field881 = true; + void method818(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); + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-108715988" + ) + int method819(int var1, int var2) { + if (var2 == 9) { + var1 = var1 + 1 & 3; } + if (var2 == 10) { + var1 = var1 + 3 & 3; + } + + if (var2 == 11) { + var1 = var1 + 3 & 3; + } + + return var1; } - @ObfuscatedName("hk") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lks;I)V", - garbageValue = "-815942128" + signature = "(IB)I", + garbageValue = "-51" ) - static final void method866(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field690; ++var1) { - int var2 = Client.field867[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 4) != 0) { - var3.targetIndex = var0.readUnsignedShort(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; + int method837(int var1) { + if (var1 != 9 && var1 != 10) { + return var1 == 11 ? 8 : var1; + } else { + return 1; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-118" + ) + @Export("init") + void init() { + if (this.tileTemplates == null) { + this.tileTemplates = new byte[8][4][]; + this.init0(); + this.init1(); + this.init2(); + this.init3(); + this.init4(); + this.init5(); + this.init6(); + this.init7(); + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1433352887" + ) + @Export("init0") + void init0() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3) { + var1[var2] = -1; } + + ++var2; } + } - int var5; - if ((var4 & 2) != 0) { - var3.spotAnimation = var0.method5762(); - var5 = var0.method5626(); - var3.field980 = var5 >> 16; - var3.field979 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field979 > Client.cycle) { - var3.spotAnimationFrame = -1; + this.tileTemplates[0][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3) { + var1[var2] = -1; } - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } + ++var2; } + } - if ((var4 & 32) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; - } + this.tileTemplates[0][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - int var6; - int var7; - int var8; - if ((var4 & 1) != 0) { - var5 = var0.method5606(); - int var9; - int var10; - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { + var1[var2] = -1; } - 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.method5606() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var3.removeHealthBar(var8); - } - } - } + ++var2; } + } - if ((var4 & 64) != 0) { - var3.field981 = var0.method5618(); - var3.field957 = var0.method5618(); - var3.field961 = var0.method5618(); - var3.field991 = var0.readByte(); - var3.field985 = var0.method5614() + Client.cycle; - var3.field986 = var0.method5614() + Client.cycle; - var3.field987 = var0.method5762(); - var3.pathLength = 1; - var3.field998 = 0; - var3.field981 += var3.pathX[0]; - var3.field957 += var3.pathY[0]; - var3.field961 += var3.pathX[0]; - var3.field991 += var3.pathY[0]; - } + this.tileTemplates[0][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - if ((var4 & 8) != 0) { - var5 = var0.method5614(); - if (var5 == 65535) { - var5 = -1; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { + var1[var2] = -1; } - var6 = var0.readUnsignedByte(); - if (var5 == var3.sequence && var5 != -1) { - var7 = GraphicsDefaults.SequenceDefinition_get(var5).field3516; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field983 = 0; + ++var2; + } + } + + this.tileTemplates[0][3] = var1; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1487501517" + ) + @Export("init1") + void init1() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[1][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var2 >= 0 && var2 < var1.length) { + if (var4 >= var3 << 1) { + var1[var2] = -1; } - if (var7 == 2) { - var3.field983 = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || GraphicsDefaults.SequenceDefinition_get(var5).field3508 >= GraphicsDefaults.SequenceDefinition_get(var3.sequence).field3508) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field983 = 0; - var3.field998 = var3.pathLength; + ++var2; + } else { + ++var2; } } + } - if ((var4 & 16) != 0) { - var3.definition = NetCache.getNpcDefinition(var0.method5762()); - var3.field942 = var3.definition.size * 64; - var3.field975 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.readySequence = var3.definition.readySequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } + this.tileTemplates[1][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - if ((var4 & 128) != 0) { - var5 = var0.method5762(); - var6 = var0.method5614(); - var7 = var3.x - (var5 - Messages.baseX * 64 - Messages.baseX * 64) * 64; - var8 = var3.y - (var6 - Language.baseY * 64 - Language.baseY * 64) * 64; - if (var7 != 0 || var8 != 0) { - var3.field967 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; } + + ++var2; + } + } + + this.tileTemplates[1][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[1][3] = var1; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-611900971" + ) + @Export("init2") + void init2() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][3] = var1; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1800334374" + ) + @Export("init3") + void init3() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[3][3] = var1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "107" + ) + @Export("init4") + void init4() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[4][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[4][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[4][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[4][3] = var1; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-68" + ) + @Export("init5") + void init5() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; + + int var3; + int var4; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[5][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 <= this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[5][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[5][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 >= this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[5][3] = var1; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "44" + ) + @Export("init6") + void init6() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; + + int var3; + int var4; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[6][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[6][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[6][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[6][3] = var1; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1415108138" + ) + @Export("init7") + void init7() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; + + int var3; + int var4; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[7][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[7][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[7][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; + } + + ++var5; + } + } + + this.tileTemplates[7][3] = var1; + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-2108955904" + ) + 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; } } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java new file mode 100644 index 0000000000..1ed99391a7 --- /dev/null +++ b/runescape-client/src/main/java/class5.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("v") +public class class5 implements class12 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lkb;)Lkb;" + ) + public Buffer vmethod131(Buffer var1) { + Buffer var2 = new Buffer(100); + this.method81(var1, var2); + return var2; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lkb;Lkb;)V" + ) + void method81(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) { + } + + var2.writeLong(var5); + } +} diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java index 909cc3fc3a..01e3e524c3 100644 --- a/runescape-client/src/main/java/class51.java +++ b/runescape-client/src/main/java/class51.java @@ -1,131 +1,239 @@ -import java.applet.Applet; -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") -public class class51 { - @ObfuscatedName("rp") - @ObfuscatedGetter( - intValue = -101053789 +@ObfuscatedName("aw") +public class class51 implements WorldMapSection { + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lkx;" ) - static int field435; - @ObfuscatedName("c") - @Export("applet") - public static Applet applet; + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("h") + static int[][][] field404; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 575472127 + ) + int field398; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1833803509 + ) + int field393; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1774846813 + ) + int field394; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1983880403 + ) + int field397; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -821206197 + ) + int field396; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1047570917 + ) + int field401; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -347542775 + ) + int field402; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -311502303 + ) + int field399; @ObfuscatedName("t") - public static String field431; - @ObfuscatedName("cm") - public static char field432; - @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = 1911186179 + intValue = -912860035 ) - @Export("cameraY") - static int cameraY; + int field400; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1883208611 + ) + int field395; - static { - applet = null; - field431 = ""; + class51() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "848753494" + signature = "(Las;I)V", + garbageValue = "1890497148" ) - static SecureRandom method896() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "827233636" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "(IZZZI)Lia;", - garbageValue = "-987500203" - ) - @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, MilliClock.JagexCache_idxFiles[var0], 1000000); + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field396) { + var1.regionLowX = this.field396; + } + + if (var1.regionHighX < this.field396) { + var1.regionHighX = this.field396; + } + + if (var1.regionLowY > this.field401) { + var1.regionLowY = this.field401; + } + + if (var1.regionHighY < this.field401) { + var1.regionHighY = this.field401; } - return new Archive(var4, TileItem.masterDisk, var0, var1, var2, var3); } - @ObfuscatedName("gw") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lba;ZI)V", - garbageValue = "-504714497" + signature = "(IIII)Z", + garbageValue = "-65934716" ) - @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.readySequence) { - var0.isUnanimated = true; - } + @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; + } else { + return false; + } + } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = GameShell.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = WorldMapSectionType.getTileHeight(var0.x, var0.y, Clock.Client_plane); - var0.playerCycle = Client.cycle; - ServerBuild.scene.addNullableObject(Clock.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field626, var0.field627, var0.field628, var0.field629); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(III)Z", + garbageValue = "-240937232" + ) + @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; + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(IIII)[I", + garbageValue = "1656767825" + ) + @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)}; + return var4; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(III)Lhj;", + garbageValue = "-226825052" + ) + @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); + } + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(Lkb;I)V", + garbageValue = "-1393433755" + ) + @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(); + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "211103794" + ) + 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}; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmf;" + ) + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.message = var2.message + ' ' + var1; + } else { + var2 = new RunException(var0, var1); + } + + return var2; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "([BI)V", + garbageValue = "1515618060" + ) + @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; } - - var0.tileHeight = WorldMapSectionType.getTileHeight(var0.x, var0.y, Clock.Client_plane); - var0.playerCycle = Client.cycle; - ServerBuild.scene.drawEntity(Clock.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); } } - } + } } - @ObfuscatedName("jp") + @ObfuscatedName("jc") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2078000833" + signature = "(B)Z", + garbageValue = "-24" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (ScriptFrame.loadInterface(var0)) { - Widget[] var1 = WorldMapLabel.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java new file mode 100644 index 0000000000..290f52f159 --- /dev/null +++ b/runescape-client/src/main/java/class52.java @@ -0,0 +1,142 @@ +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") +public final class class52 { + @ObfuscatedName("ef") + @ObfuscatedGetter( + intValue = -508304297 + ) + static int field407; + @ObfuscatedName("gr") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-784307699" + ) + 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); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.method5724(var1); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "(ILce;ZB)I", + garbageValue = "16" + ) + 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; + } + } + } +} diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class56.java similarity index 55% rename from runescape-client/src/main/java/class47.java rename to runescape-client/src/main/java/class56.java index 9e32698640..aab3cbe4f4 100644 --- a/runescape-client/src/main/java/class47.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("ag") -public class class47 { - @ObfuscatedName("c") +@ObfuscatedName("bk") +public class class56 { + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", - garbageValue = "1719913469" + signature = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", + garbageValue = "1" ) - public static Object method857(Applet var0, String var1) throws Throwable { + public static Object method950(Applet var0, String var1) throws Throwable { return JSObject.getWindow(var0).call(var1, (Object[])null); } } diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java new file mode 100644 index 0000000000..68e97121a1 --- /dev/null +++ b/runescape-client/src/main/java/class58.java @@ -0,0 +1,115 @@ +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") +public class class58 { + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("dw") + @ObfuscatedGetter( + longValue = 3841945927555236577L + ) + static long field455; + + static { + ImageIO.setUseCache(false); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-2115896796" + ) + 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); + } + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java new file mode 100644 index 0000000000..b66b3a18da --- /dev/null +++ b/runescape-client/src/main/java/class6.java @@ -0,0 +1,80 @@ +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("q") +public class class6 implements class11 { + @ObfuscatedName("x") + final MessageDigest field27; + + @ObfuscatedSignature( + signature = "(Ls;)V" + ) + class6(class10 var1) { + this.field27 = this.method87(); + } + + @ObfuscatedName("x") + boolean method83(int var1, String var2, long var3) { + byte[] var5 = this.method91(var2, var3); + return method97(var5) >= var1; + } + + @ObfuscatedName("d") + byte[] method91(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); + var4.append(var1).append(Long.toHexString(var2)); + this.field27.reset(); + + try { + this.field27.update(var4.toString().getBytes("UTF-8")); + } catch (UnsupportedEncodingException var6) { + var6.printStackTrace(); + } + + return this.field27.digest(); + } + + @ObfuscatedName("w") + MessageDigest method87() { + try { + return MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException var2) { + var2.printStackTrace(); + return null; + } + } + + @ObfuscatedName("m") + static int method97(byte[] var0) { + int var1 = 0; + byte[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + byte var4 = var2[var3]; + int var5 = method85(var4); + var1 += var5; + if (var5 != 8) { + break; + } + } + + return var1; + } + + @ObfuscatedName("k") + static int method85(byte var0) { + int var1 = 0; + if (var0 == 0) { + var1 = 8; + } else { + for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { + ++var1; + } + } + + return var1; + } +} diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 7b53d3f6bf..83092805dd 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,66 +1,153 @@ +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("by") +@ObfuscatedName("bt") public class class60 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IIIB)Llt;", - garbageValue = "-75" + @ObfuscatedName("x") + @Export("applet") + public static Applet applet; + @ObfuscatedName("m") + public static String field462; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 200770361 ) - static Sprite method1187(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (Sprite)var3.get(var4); + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + + static { + applet = null; + field462 = ""; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "399191905" + signature = "(II)Lif;", + garbageValue = "-696554810" ) - static final void method1188(String var0) { - ClientPreferences.addGameMessage(30, "", var0); + 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); + } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("in") + @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-42" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-9" ) - static final void method1186() { - 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; - } + @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); + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + signature = "(IIIIIII)V", + garbageValue = "-228702425" + ) + 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; + } + + 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/class65.java b/runescape-client/src/main/java/class65.java deleted file mode 100644 index a8ea8b6c5a..0000000000 --- a/runescape-client/src/main/java/class65.java +++ /dev/null @@ -1,77 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bm") -public class class65 extends RouteStrategy { - @ObfuscatedName("de") - @ObfuscatedSignature( - signature = "Lia;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("ga") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("lg") - @ObfuscatedGetter( - intValue = 1699328089 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - - class65() { - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IIILfv;B)Z", - garbageValue = "50" - ) - @Export("hasArrived") - protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(II)Liu;", - garbageValue = "890351754" - ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "(Ldn;B)V", - garbageValue = "71" - ) - @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/class69.java b/runescape-client/src/main/java/class69.java new file mode 100644 index 0000000000..692789461e --- /dev/null +++ b/runescape-client/src/main/java/class69.java @@ -0,0 +1,141 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("bp") +public class class69 { + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "[Lla;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("fm") + @ObfuscatedGetter( + intValue = 731242929 + ) + @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); + } +} diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java new file mode 100644 index 0000000000..f97c7ed524 --- /dev/null +++ b/runescape-client/src/main/java/class7.java @@ -0,0 +1,154 @@ +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("z") +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 + ) + public final int field30; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -32487403 + ) + final int field31; + + class7(int var3, int var4) { + this.field30 = var3; + this.field31 = var4; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "56" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field31; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-185431723" + ) + static int method98() { + return 12; + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Liy;Ljava/lang/String;Ljava/lang/String;B)Lle;", + garbageValue = "1" + ) + @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; + } else { + var5 = AttackOption.method2165(); + } + + return var5; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1823376013" + ) + public static void method104() { + if (NetCache.NetCache_socket != null) { + NetCache.NetCache_socket.close(); + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1393352524" + ) + 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; + } else { + return 2; + } + } +} diff --git a/runescape-client/src/main/java/class74.java b/runescape-client/src/main/java/class74.java new file mode 100644 index 0000000000..ec8a4b7e87 --- /dev/null +++ b/runescape-client/src/main/java/class74.java @@ -0,0 +1,105 @@ +import java.util.Date; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("bj") +public class class74 extends RouteStrategy { + @ObfuscatedName("hp") + @ObfuscatedGetter( + intValue = 363395723 + ) + @Export("cameraPitch") + static int cameraPitch; + + class74() { + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IIILfm;B)Z", + garbageValue = "-112" + ) + @Export("hasArrived") + public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Liy;IIIZI)V", + garbageValue = "-1342711563" + ) + 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; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)Lfb;", + garbageValue = "1735702864" + ) + public static Clock method1326() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2095073196" + ) + @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; + } + + Client var16 = WorldMapSection1.client; + var5 = "document.cookie=\"" + var3 + "\""; + JSObject.getWindow(var16).eval(var5); + } catch (Throwable var15) { + } + + } +} diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java new file mode 100644 index 0000000000..2578c5d06b --- /dev/null +++ b/runescape-client/src/main/java/class8.java @@ -0,0 +1,52 @@ +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") +public class class8 implements Callable { + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 878418019 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lkb;" + ) + final Buffer field42; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Ln;" + ) + final class12 field43; + // $FF: synthetic field + @ObfuscatedSignature( + signature = "Le;" + ) + final class9 this$0; + + @ObfuscatedSignature( + signature = "(Le;Lkb;Ln;)V" + ) + class8(class9 var1, Buffer var2, class12 var3) { + this.this$0 = var1; + this.field42 = var2; + this.field43 = var3; + } + + public Object call() { + return this.field43.vmethod131(this.field42); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "11" + ) + public static void method109() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + } +} diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java deleted file mode 100644 index 274aa85da6..0000000000 --- a/runescape-client/src/main/java/class80.java +++ /dev/null @@ -1,61 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cr") -public class class80 { - @ObfuscatedName("i") - static final BigInteger field1123; - @ObfuscatedName("g") - static final BigInteger field1120; - - static { - field1123 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1120 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lks;I)I", - garbageValue = "-1637825226" - ) - static int method2094(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)V", - garbageValue = "-1745616388" - ) - static final void method2097() { - class60.method1188("You can't add yourself to your own ignore list"); - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - signature = "(Lhn;II)Ljava/lang/String;", - garbageValue = "237205846" - ) - static String method2098(Widget var0, int var1) { - int var3 = WorldMapIcon_0.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && var0.onOp == null) { - return null; - } else { - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; - } - } -} diff --git a/runescape-client/src/main/java/class81.java b/runescape-client/src/main/java/class81.java deleted file mode 100644 index 8884cf2694..0000000000 --- a/runescape-client/src/main/java/class81.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("co") -public class class81 { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2019499752" - ) - static void method2099() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - - } -} diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java deleted file mode 100644 index 9749f473dd..0000000000 --- a/runescape-client/src/main/java/class83.java +++ /dev/null @@ -1,68 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cn") -public class class83 { - @ObfuscatedName("c") - static final BigInteger field1151; - @ObfuscatedName("t") - static final BigInteger field1150; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1334117913 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - - static { - field1151 = new BigInteger("10001", 16); - field1150 = new BigInteger("c20a7ab5337092e3e04d646de102abda0a14c2669233a3df9db8a57acccc6e54d9e9a5eaa408b39b17d7cc429c38a98aa62a7fb616e714a301546ff47456dcc74c2003b3fc6683bb22ac4170ee6bc1ecad99bb26b684c3264c94a8b411e363a7b55bb16c0fef207993b812f36888b07a465243bd4640d3bd4828356795dcb74d", 16); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lii;I)V", - garbageValue = "590815960" - ) - public static void method2109(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)[Lgy;", - garbageValue = "1" - ) - public static class185[] method2107() { - return new class185[]{class185.field2327, class185.field2315, class185.field2322, class185.field2317, class185.field2318, class185.field2320, class185.field2319, class185.field2314, class185.field2316, class185.field2323}; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "17386837" - ) - public static int method2108(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Lia;II)V", - garbageValue = "319200175" - ) - static void method2110(Archive var0, int var1) { - if (class4.NetCache_reference != null) { - class4.NetCache_reference.offset = var1 * 8 + 5; - int var2 = class4.NetCache_reference.readInt(); - int var3 = class4.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); - } else { - BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; - } - } -} diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java new file mode 100644 index 0000000000..103dee0d85 --- /dev/null +++ b/runescape-client/src/main/java/class89.java @@ -0,0 +1,23 @@ +import java.math.BigInteger; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("cx") +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; + + static { + field1158 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1155 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } +} diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java new file mode 100644 index 0000000000..83c5008268 --- /dev/null +++ b/runescape-client/src/main/java/class9.java @@ -0,0 +1,113 @@ +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("e") +public class class9 { + @ObfuscatedName("ls") + @ObfuscatedSignature( + signature = "Lhe;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("x") + ExecutorService field49; + @ObfuscatedName("m") + Future field45; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lkb;" + ) + final Buffer field44; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Ln;" + ) + final class12 field46; + + @ObfuscatedSignature( + signature = "(Lkb;Ln;)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(); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-194627920" + ) + public void method110() { + this.field49.shutdown(); + this.field49 = null; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(I)Lkb;", + garbageValue = "357894272" + ) + public Buffer method113() { + try { + return (Buffer)this.field45.get(); + } catch (Exception var2) { + return null; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2043166937" + ) + void method114() { + this.field45 = this.field49.submit(new class8(this, this.field44, this.field46)); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lln;ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "171" + ) + 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; + } + + return var1 == 1007; + } + } +} diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java new file mode 100644 index 0000000000..c09ba92c15 --- /dev/null +++ b/runescape-client/src/main/java/class90.java @@ -0,0 +1,81 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cn") +public class class90 { + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-879105119" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; + + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } + } + + return var5; + } +} diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java new file mode 100644 index 0000000000..975adf93af --- /dev/null +++ b/runescape-client/src/main/java/class92.java @@ -0,0 +1,106 @@ +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") +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 { + field1181 = new BigInteger("10001", 16); + field1178 = new BigInteger("b9c1060ac8499f373d9882f40e43f340f6412f30973ccc7b9bb633c15d4a925f92027c296efdc543c468986c6193597fb0e999c8f73ded9d5349a8e2e3a2ddea56262dae24e1c26ef213c9dd7b5bd35ecbc26d1286a99e20295e9ab9ec46c5609f15dc2f12d412f3fc027b4677ece3d578af01cebe5e1dbba80c81bcb118f8dd", 16); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Liy;Liy;I)I", + garbageValue = "-1982305886" + ) + static int method2156(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("s") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-78" + ) + public static void method2155() { + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + } +} diff --git a/runescape-client/src/main/java/class96.java b/runescape-client/src/main/java/class96.java deleted file mode 100644 index 3afb0b65bd..0000000000 --- a/runescape-client/src/main/java/class96.java +++ /dev/null @@ -1,191 +0,0 @@ -import java.util.Iterator; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ca") -public class class96 { - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Ljj;" - ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "[Lbg;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -44296149 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - - static { - reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "512388995" - ) - static final int method2346() { - if (WorldMapSection2.clientPreferences.roofsHidden) { - return Clock.Client_plane; - } else { - int var0 = 3; - if (GrandExchangeOffer.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = PendingSpawn.oculusOrbFocalPointX >> 7; - var2 = Skeleton.oculusOrbFocalPointY >> 7; - } else { - var1 = class192.localPlayer.x >> 7; - var2 = class192.localPlayer.y >> 7; - } - - int var3 = HitSplatDefinition.cameraX >> 7; - int var4 = Actor.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return Clock.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return Clock.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { - var0 = Clock.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[Clock.Client_plane][var3][var4] & 4) != 0) { - var0 = Clock.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { - var0 = Clock.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[Clock.Client_plane][var3][var4] & 4) != 0) { - var0 = Clock.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { - var0 = Clock.Client_plane; - } - } - } - } - } - - if (class192.localPlayer.x >= 0 && class192.localPlayer.y >= 0 && class192.localPlayer.x < 13312 && class192.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[Clock.Client_plane][class192.localPlayer.x >> 7][class192.localPlayer.y >> 7] & 4) != 0) { - var0 = Clock.Client_plane; - } - - return var0; - } else { - return Clock.Client_plane; - } - } - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2092655823" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1882557485" - ) - @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(); - } - - } -}